Author: tchemit Date: 2013-01-19 08:13:30 +0100 (Sat, 19 Jan 2013) New Revision: 232 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/232 Log: - use license-m-p 1.4 and improve third-parties configuration - add getAllProtocolNames method in persistence - fix protocol name validation for editing existing protocol Modified: trunk/pom.xml trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/pom.xml 2013-01-19 07:13:30 UTC (rev 232) @@ -120,6 +120,8 @@ <platform>forge.codelutin.com</platform> <projectId>tutti</projectId> + <licensePluginVersion>1.4</licensePluginVersion> + <!-- libraries version --> <nuitonUtilsVersion>2.6.6</nuitonUtilsVersion> @@ -470,6 +472,29 @@ </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <configuration> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0| + Apache License, Version 2.0 + </licenseMerge> + <licenseMerge>General Public License (GPL)| + GNU LESSER GENERAL PUBLIC LICENSE + </licenseMerge> + <licenseMerge>General Public License (GPL)| + GNU Lesser General Public License + </licenseMerge> + <licenseMerge> + Common Development and Distribution License (CDDL) v1.0| + COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + </licenseMerge> + <licenseMerge>BSD License|BSD</licenseMerge> + </licenseMerges> + </configuration> + </plugin> + </plugins> </pluginManagement> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-01-19 07:13:30 UTC (rev 232) @@ -180,6 +180,8 @@ //-- Protocol methods --// //------------------------------------------------------------------------// + List<String> getAllProtocolNames(); + List<TuttiProtocol> getAllProtocol(); TuttiProtocol getProtocol(String id); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java 2013-01-19 07:13:30 UTC (rev 232) @@ -38,6 +38,8 @@ @Transactional(readOnly = true) public interface ProtocolPersistenceService { + List<String> getAllProtocolId(); + List<TuttiProtocol> getAllProtocol(); TuttiProtocol getProtocol(String id); Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2013-01-19 07:13:30 UTC (rev 232) @@ -314,6 +314,11 @@ //------------------------------------------------------------------------// @Override + public List<String> getAllProtocolNames() { + return protocolService.getAllProtocolId(); + } + + @Override public List<TuttiProtocol> getAllProtocol() { return protocolService.getAllProtocol(); } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-01-19 07:13:30 UTC (rev 232) @@ -43,6 +43,11 @@ LogFactory.getLog(ProtocolPersistenceServiceImpl.class); @Override + public List<String> getAllProtocolId() { + return null; + } + + @Override public List<TuttiProtocol> getAllProtocol() { return null; } Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-01-19 07:13:30 UTC (rev 232) @@ -25,6 +25,7 @@ */ +import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -123,7 +124,6 @@ FILE_KEYS.add(getKey(Caracteristic.class, caracteristicEnum.name())); } - if (log.isInfoEnabled()) { log.info("Found " + FILE_KEYS.size() + " files."); } @@ -131,6 +131,14 @@ public static final String SKIP_FIXTURES_OPTION = "LoadFixtures"; + public static final Function<TuttiProtocol, String> GET_PROTOCOL_NAME = new Function<TuttiProtocol, String>() { + + @Override + public String apply(TuttiProtocol input) { + return input.getName(); + } + }; + /** * Persistence config. * @@ -389,13 +397,12 @@ @Override public List<Cruise> getAllCruise(final String programId) { - List<Cruise> data = getData(Cruise.class.getName()); - List<Cruise> result = Lists.newArrayList(Iterables.filter(data, new Predicate<Cruise>() { + List<Cruise> result = getFilteredDataList(Cruise.class.getName(), new Predicate<Cruise>() { @Override public boolean apply(Cruise input) { return programId.equals(input.getProgram().getId()); } - })); + }); return result; } @@ -422,6 +429,12 @@ //------------------------------------------------------------------------// @Override + public List<String> getAllProtocolNames() { + List<String> result = getTransformedDataList(TuttiProtocol.class.getName(), GET_PROTOCOL_NAME); + return result; + } + + @Override public List<TuttiProtocol> getAllProtocol() { List<TuttiProtocol> result = getDataInNewList(TuttiProtocol.class.getName()); return result; @@ -451,13 +464,12 @@ @Override public List<FishingOperation> getAllFishingOperation(final String cruiseId) { - List<FishingOperation> data = getData(FishingOperation.class.getName()); - List<FishingOperation> result = Lists.newArrayList(Iterables.filter(data, new Predicate<FishingOperation>() { + List<FishingOperation> result = getFilteredDataList(FishingOperation.class.getName(), new Predicate<FishingOperation>() { @Override public boolean apply(FishingOperation input) { return cruiseId.equals(input.getCruise().getId()); } - })); + }); return result; } @@ -576,13 +588,12 @@ @Override public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(final String speciesBatchId) { - List<SpeciesBatchFrequency> data = getData(SpeciesBatchFrequency.class.getName()); - List<SpeciesBatchFrequency> result = Lists.newArrayList(Iterables.filter(data, new Predicate<SpeciesBatchFrequency>() { + List<SpeciesBatchFrequency> result = getFilteredDataList(SpeciesBatchFrequency.class.getName(), new Predicate<SpeciesBatchFrequency>() { @Override public boolean apply(SpeciesBatchFrequency input) { return speciesBatchId.equals(input.getBatch().getId()); } - })); + }); return result; } @@ -962,6 +973,16 @@ return Lists.newArrayList(result); } + protected <B extends IdAware, E> List<E> getTransformedDataList(String entityType, Function<B, E> function) { + List<B> result = getData(entityType); + return Lists.newArrayList(Iterables.transform(result, function)); + } + + protected <B extends IdAware> List<B> getFilteredDataList(String entityType, Predicate<B> predicate) { + List<B> result = getData(entityType); + return Lists.newArrayList(Iterables.filter(result, predicate)); + } + protected <B extends FishingOperationAware> List<B> getAllTraitFilterBatches( String beanType, String traitId, @@ -970,8 +991,7 @@ if (extraPredicate != null) { predicate = Predicates.and(predicate, extraPredicate); } - List<B> data = getData(beanType); - List<B> result = Lists.newArrayList(Iterables.filter(data, predicate)); + List<B> result = getFilteredDataList(beanType, predicate); return result; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-01-19 07:13:30 UTC (rev 232) @@ -343,6 +343,11 @@ //------------------------------------------------------------------------// @Override + public List<String> getAllProtocolNames() { + return devDriver.getAllProtocolNames(); + } + + @Override public List<TuttiProtocol> getAllProtocol() { return devDriver.getAllProtocol(); } @@ -362,7 +367,6 @@ return devDriver.saveProtocol(bean); } - //------------------------------------------------------------------------// //-- FishingOperation methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-ui-swing/pom.xml 2013-01-19 07:13:30 UTC (rev 232) @@ -21,7 +21,9 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -148,14 +150,6 @@ <goal>update-project-license</goal> <goal>add-third-party</goal> </goals> - <configuration> - <licenseMerges> - <licenseMerge> - The Apache Software License, Version 2.0|Apache License, Version 2.0 - </licenseMerge> - <licenseMerge>BSD License|BSD</licenseMerge> - </licenseMerges> - </configuration> </execution> </executions> </plugin> Modified: trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-01-19 07:13:30 UTC (rev 232) @@ -4,13 +4,10 @@ # - Affero General Public License (AGPL) # - BSD License # - BSD-3 Clause License -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - Eclipse Public License - v 1.0 # - GNU General Public License - Version 2 with the class path exception -# - GNU LESSER GENERAL PUBLIC LICENSE -# - GNU Lesser General Public License # - General Public License (GPL) # - HSQLDB License # - LGPL 2.1 @@ -26,9 +23,9 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jan 13 15:29:41 CET 2013 +#Sat Jan 19 08:03:03 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.transaction--jta--1.1=Common Development and Distribution License (CDDL) v1.0 regexp--regexp--1.3=The Apache Software License, Version 2.0 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-19 07:13:30 UTC (rev 232) @@ -24,12 +24,10 @@ * #L% */ -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -182,15 +180,7 @@ allSpecies = TuttiEntities.splitById( persistenceService.getAllSpecies()); - List<TuttiProtocol> allProtocol = persistenceService.getAllProtocol(); - - List<String> protocolNames = Lists.newArrayList(Iterables.transform(allProtocol, new Function<TuttiProtocol, String>() { - @Override - public String apply(TuttiProtocol input) { - return input.getName(); - } - })); - + List<String> protocolNames = persistenceService.getAllProtocolNames(); model.setProtocolNames(protocolNames); allLengthStepPmfm = TuttiEntities.splitById( @@ -246,6 +236,13 @@ } } + String existingProtocolName = model.getName(); + if (existingProtocolName != null) { + + // remove existing protocol name from the already used list + model.getProtocolNames().remove(existingProtocolName); + } + SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model); Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel-error-validation.xml 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel-error-validation.xml 2013-01-19 07:13:30 UTC (rev 232) @@ -33,7 +33,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ id != null || !nameAlreadyUsed ]]> + <![CDATA[ !nameAlreadyUsed ]]> </param> <message>tutti.validator.error.protocol.name.alreadyUsed</message> </field-validator> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-19 03:03:04 UTC (rev 231) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-19 07:13:30 UTC (rev 232) @@ -193,13 +193,13 @@ tutti.label.tab.accidentel=Captures accidentelles tutti.label.tab.benthos=Benthos tutti.label.tab.catches=Captures +tutti.label.tab.catchesCaracteristics=Résumé tutti.label.tab.fishingOperation=Trait tutti.label.tab.fishingOperation.environment=Environnement tutti.label.tab.fishingOperation.gearShooting=Mise en oeuvre de l'engin tutti.label.tab.fishingOperation.general=Trait tutti.label.tab.fishingOperation.hydrology=Paramètres hydrologiques tutti.label.tab.macroDechet=Macro déchets -tutti.label.tab.catchesCaracteristics=Résumé tutti.label.tab.observationIndividuel=Observations individuelles tutti.label.tab.plancton=Plancton tutti.label.tab.protocol.accidental=Accidental