Author: tchemit Date: 2011-11-09 08:29:52 +0100 (Wed, 09 Nov 2011) New Revision: 27 Url: http://forge.codelutin.com/repositories/revision/echobase/27 Log: add entity EntityModificationLog + improve configuration and db meta Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-09 07:26:15 UTC (rev 26) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-09 07:29:52 UTC (rev 27) @@ -126,6 +126,11 @@ return driverClass.getSimpleName().toLowerCase().contains("h2"); } + public boolean getOptionAsBoolean(String propertyName) { + Boolean result = applicationConfig.getOptionAsBoolean(propertyName); + return result!=null && result; + } + /** * Creates a directory given the configuration given key. * Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java 2011-11-09 07:29:52 UTC (rev 27) @@ -0,0 +1,46 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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% + */ +package fr.ifremer.echobase.entities; + +/** + * Default implementation of {@link EntityModificationLog}. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.1 + */ +public class EntityModificationLogImpl extends EntityModificationLogAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public EntityModificationLogDTO toDTO() { + EntityModificationLogDTO result = new EntityModificationLogDTOImpl(); + result.setEntityType(getEntityType()); + result.setEntityId(getEntityId()); + result.setModificationDate(getModificationDate()); + result.setModificationText(getModificationText()); + result.setUser(getUser().toDTO()); + return result; + } +} Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntityModificationLogImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2011-11-09 07:26:15 UTC (rev 26) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2011-11-09 07:29:52 UTC (rev 27) @@ -73,6 +73,10 @@ return entityEnum; } + public Class<? extends TopiaEntity> getEntityType() { + return entityEnum.getContract(); + } + public String getI18nKey() { return i18nKey; } @@ -93,6 +97,11 @@ return result; } + public String[] getColumnNamesAsArray() { + List<String> columnNames = getColumnNames(); + return columnNames.toArray(new String[columnNames.size()]); + } + public List<String> getColumnNames() { List<String> result = Lists.newLinkedList(); for (ColumnMeta columnMeta : getColumns()) { Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-09 07:26:15 UTC (rev 26) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-09 07:29:52 UTC (rev 27) @@ -3,13 +3,20 @@ echobase.common.echoBaseUser=Utilisateur echobase.common.echoBaseUserDTO= echobase.common.email=Courriel +echobase.common.entityId=Identifiant de l'entité +echobase.common.entityModificationLog=Journal des modifications +echobase.common.entityModificationLogDTO= +echobase.common.entityType=Type de l'entité echobase.common.exportQuery=Requête d'export echobase.common.exportQueryDTO= echobase.common.id=Identifiant echobase.common.lastModifiedDate=Date de dernière modification echobase.common.lastModifiedUser=Utilisateur de dernière modification +echobase.common.modificationDate=Date de modification +echobase.common.modificationText=Modification echobase.common.name=Nom echobase.common.password=Mot de passe echobase.common.sqlQuery=Requête SQL -echobase.common.survey= +echobase.common.survey=Campagne +echobase.common.user=Utilisateur echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)