December 2013 - Tutti-commits - mailman.cloud.codelutin.com

r1459 - trunk
by tchemit＠users.forge.codelutin.com Dec. 10, 2013

Dec. 10, 2013

Author: tchemit Date: 2013-12-10 09:26:14 +0100 (Tue, 10 Dec 2013) New Revision: 1459 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1459 Log: refs #3950: installation rc2 : tourne en boucle sur installation rapport (update report module version) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-10 08:11:32 UTC (rev 1458) +++ trunk/pom.xml 2013-12-10 08:26:14 UTC (rev 1459) @@ -155,7 +155,7 @@ <dbVersion>2013.11.29</dbVersion>  - <reportVersion>2013.12.03</reportVersion> + <reportVersion>2013.12.10</reportVersion> </properties>

1 0

r1458 - trunk
by tchemit＠users.forge.codelutin.com Dec. 10, 2013

Dec. 10, 2013

Author: tchemit Date: 2013-12-10 09:11:32 +0100 (Tue, 10 Dec 2013) New Revision: 1458 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1458 Log: clean poms Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-10 07:59:15 UTC (rev 1457) +++ trunk/pom.xml 2013-12-10 08:11:32 UTC (rev 1458) @@ -129,12 +129,9 @@ <xworkVersion>2.3.15.1</xworkVersion> <slf4jVersion>1.7.5</slf4jVersion> <adagioVersion>3.4.1</adagioVersion> - <birtVersion>4.3.1-1</birtVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <spring.version>3.2.3.RELEASE</spring.version> <slf4j.version>1.6.1</slf4j.version> - <ehcache.version>2.3.0</ehcache.version> - <javassist.version>3.12.1.GA</javassist.version> <hsqldb.version>2.2.9</hsqldb.version> <jdbc.hsqldb.version>1.8.0.10</jdbc.hsqldb.version> @@ -396,7 +393,7 @@ <dependency> <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> - <version>${birtVersion}</version> + <version>4.3.1-1</version> <classifier>codelutin</classifier> </dependency>

1 0

r1457 - birt-runtime/tags/birt-runtime-4.3.1-1
by tchemit＠users.forge.codelutin.com Dec. 10, 2013

Dec. 10, 2013

Author: tchemit Date: 2013-12-10 08:59:15 +0100 (Tue, 10 Dec 2013) New Revision: 1457 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1457 Log: fix release Modified: birt-runtime/tags/birt-runtime-4.3.1-1/pom.xml Modified: birt-runtime/tags/birt-runtime-4.3.1-1/pom.xml =================================================================== --- birt-runtime/tags/birt-runtime-4.3.1-1/pom.xml 2013-12-10 07:29:47 UTC (rev 1456) +++ birt-runtime/tags/birt-runtime-4.3.1-1/pom.xml 2013-12-10 07:59:15 UTC (rev 1457) @@ -502,14 +502,14 @@ <file>${project.basedir}/pom.xml</file> <type>pom</type> </artifact> -  -  + </artifact> </artifacts> </configuration> </execution> @@ -539,35 +539,30 @@ <plugin> <artifactId>maven-deploy-plugin</artifactId> <executions> -  + </execution> - <execution> - <id>deploy-jar</id> +  </executions>

1 0

r1456 - birt-runtime/tags/birt-runtime-4.3.1-1
by tchemit＠users.forge.codelutin.com Dec. 10, 2013

Dec. 10, 2013

Author: tchemit Date: 2013-12-10 08:29:47 +0100 (Tue, 10 Dec 2013) New Revision: 1456 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1456 Log: fix release Modified: birt-runtime/tags/birt-runtime-4.3.1-1/pom.xml Modified: birt-runtime/tags/birt-runtime-4.3.1-1/pom.xml =================================================================== --- birt-runtime/tags/birt-runtime-4.3.1-1/pom.xml 2013-12-09 21:45:04 UTC (rev 1455) +++ birt-runtime/tags/birt-runtime-4.3.1-1/pom.xml 2013-12-10 07:29:47 UTC (rev 1456) @@ -99,6 +99,11 @@ <skipPostRelease>false</skipPostRelease> <mdep.analyze.skip>true</mdep.analyze.skip> + + <repository.home.url> + http://nexus.nuiton.org/nexus/content/repositories/tutti-third-parties + </repository.home.url> + </properties> <dependencyManagement> @@ -494,13 +499,17 @@ <configuration> <artifacts> <artifact> + <file>${project.basedir}/pom.xml</file> + <type>pom</type> + </artifact> +  +  </artifacts> </configuration> </execution> @@ -509,5 +518,70 @@ </plugins> </build> </profile> + + <profile> + <id>post-release-profile</id> + <build> + <plugins> + + <plugin> + <artifactId>maven-install-plugin</artifactId> + <executions> + <execution> + <id>default-install</id> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <executions> +  + + <execution> + <id>deploy-jar</id> + <goals><goal>deploy-file</goal></goals> + <phase>deploy</phase> + <configuration> + <file>${project.build.directory}/org.eclipse.birt.runtime-${birtVersion}.jar</file> + <files> + ${project.build.directory}/org.eclipse.birt.runtime-${birtVersion}-sources.jar.asc + ${project.build.directory}/org.eclipse.birt.runtime-${birtVersion}-sources.jar, + ${project.build.directory}/org.eclipse.birt.runtime-${birtVersion}.jar.asc, + ${project.build.directory}/org.eclipse.birt.runtime-${birtVersion}.jar, + </files> + <classifiers>sources,sources,,</classifiers> + <types>asc,jar,asc,jar</types> + </configuration> + </execution> + + </executions> + + <configuration> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <url>${repository.home.url}</url> + <repositoryId>nuiton-nexus-deploy</repositoryId> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>

1 0

r1455 - birt-runtime/trunk
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:45:04 +0100 (Mon, 09 Dec 2013) New Revision: 1455 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1455 Log: [maven-release-plugin] prepare for next development iteration Modified: birt-runtime/trunk/pom.xml Modified: birt-runtime/trunk/pom.xml =================================================================== --- birt-runtime/trunk/pom.xml 2013-12-09 21:44:56 UTC (rev 1454) +++ birt-runtime/trunk/pom.xml 2013-12-09 21:45:04 UTC (rev 1455) @@ -31,7 +31,7 @@ <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> - <version>4.3.1-1</version> + <version>4.3.2-SNAPSHOT</version> <name>Birt runtime (repackage by Code Lutin)</name> <description> @@ -71,12 +71,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/birt-runtime/tags/birt-runtime-4.3…</url> + <url>http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/tags/birt-run… + scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/tags/birt-run… + scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk </developerConnection> </scm>

1 0

r1454 - birt-runtime/tags
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:44:56 +0100 (Mon, 09 Dec 2013) New Revision: 1454 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1454 Log: [maven-release-plugin] copy for tag birt-runtime-4.3.1-1 Added: birt-runtime/tags/birt-runtime-4.3.1-1/

1 0

r1453 - birt-runtime/trunk
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:44:47 +0100 (Mon, 09 Dec 2013) New Revision: 1453 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1453 Log: [maven-release-plugin] prepare release birt-runtime-4.3.1-1 Modified: birt-runtime/trunk/pom.xml Modified: birt-runtime/trunk/pom.xml =================================================================== --- birt-runtime/trunk/pom.xml 2013-12-09 21:39:04 UTC (rev 1452) +++ birt-runtime/trunk/pom.xml 2013-12-09 21:44:47 UTC (rev 1453) @@ -20,9 +20,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #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> <parent> @@ -33,7 +31,7 @@ <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> - <version>4.3.1-1-SNAPSHOT</version> + <version>4.3.1-1</version> <name>Birt runtime (repackage by Code Lutin)</name> <description> @@ -73,12 +71,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/birt-runtime/tags/birt-runtime-4.3…</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/tags/birt-run… </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/birt-runtime/tags/birt-run… </developerConnection> </scm>

1 0

r1452 - birt-runtime
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:39:04 +0100 (Mon, 09 Dec 2013) New Revision: 1452 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1452 Log: add tags directory Added: birt-runtime/tags/

1 0

r1451 - birt-runtime/trunk
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:38:13 +0100 (Mon, 09 Dec 2013) New Revision: 1451 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1451 Log: fix build before release Modified: birt-runtime/trunk/pom.xml Modified: birt-runtime/trunk/pom.xml =================================================================== --- birt-runtime/trunk/pom.xml 2013-12-09 21:31:39 UTC (rev 1450) +++ birt-runtime/trunk/pom.xml 2013-12-09 21:38:13 UTC (rev 1451) @@ -33,7 +33,7 @@ <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> - <version>4.3.1-1</version> + <version>4.3.1-1-SNAPSHOT</version> <name>Birt runtime (repackage by Code Lutin)</name> <description> @@ -383,6 +383,32 @@ </executions> </plugin> +  + <plugin> + <artifactId>maven-install-plugin</artifactId> + <executions> + <execution> + <id>default-install</id> + <configuration> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <executions> + <execution> + <id>default-deploy</id> + <configuration> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> </build>

1 0

r1450 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities tutti-persistence/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency tutti-ui-swing/src/mai
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:31:39 +0100 (Mon, 09 Dec 2013) New Revision: 1450 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1450 Log: fixes #3928: [ERGO] erreur clic droit dans les tableaux fixes #3946: Utiliser ifremer-shared 1.0.1 Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/pom.xml 2013-12-09 21:31:39 UTC (rev 1450) @@ -113,35 +113,30 @@ <projectId>tutti</projectId>  -  -  -  -  + <maven.compiler.source>1.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion>  - - <ifremerApplicationVersion>1.1-SNAPSHOT</ifremerApplicationVersion> + <ifremerApplicationVersion>1.0.1</ifremerApplicationVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> - <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> - <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion> - <nuitonUpdaterVersion>3.0-alpha-1</nuitonUpdaterVersion> - <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> - <eugenePluginVersion>2.7.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15.1</xworkVersion> - <slf4jVersion>1.7.5</slf4jVersion> - <adagioVersion>3.4.1</adagioVersion> <birtVersion>4.3.1-1</birtVersion> - <bluecoveVersion>2.1.0</bluecoveVersion> + <spring.version>3.2.3.RELEASE</spring.version> + <slf4j.version>1.6.1</slf4j.version> + <ehcache.version>2.3.0</ehcache.version> + <javassist.version>3.12.1.GA</javassist.version> + <hsqldb.version>2.2.9</hsqldb.version> + <jdbc.hsqldb.version>1.8.0.10</jdbc.hsqldb.version> <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -156,14 +151,6 @@ <license.organizationName>Ifremer</license.organizationName> <license.licenseName>gpl_v3</license.licenseName> - <aspectj.version>1.6.6</aspectj.version> - <spring.version>3.2.3.RELEASE</spring.version> - <slf4j.version>1.6.1</slf4j.version> - <ehcache.version>2.3.0</ehcache.version> - <javassist.version>3.12.1.GA</javassist.version> - <hsqldb.version>2.2.9</hsqldb.version> - <jdbc.hsqldb.version>1.8.0.10</jdbc.hsqldb.version> -  <jreVersion>1.7.45</jreVersion> @@ -240,27 +227,27 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>2.7.1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> - <version>${nuitonDecoratorVersion}</version> + <version>3.0-alpha-2</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>${nuitonConfigVersion}</version> + <version>3.0-alpha-1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-updater</artifactId> - <version>${nuitonUpdaterVersion}</version> + <version>3.0-alpha-1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>${nuitonCsvVersion}</version> + <version>3.0-alpha-1</version> </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -32,6 +32,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; +import fr.ifremer.shared.application.ApplicationDataUtil; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -39,14 +40,11 @@ import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; import java.io.File; -import java.math.BigDecimal; -import java.math.MathContext; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; @@ -55,7 +53,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -68,7 +65,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class TuttiEntities { +public class TuttiEntities extends ApplicationDataUtil { public static final Comparator<Species> SPECIES_BY_NAME_COMPARATOR = new Comparator<Species>() { @@ -98,8 +95,6 @@ } }; - private static final MathContext MATH_CONTEXT_4_DIGIT = new MathContext(4); - /** Logger. */ private static final Log log = LogFactory.getLog(TuttiEntities.class); @@ -240,20 +235,20 @@ } } - public static void closeSilently(Connection connection) { - try { - if (connection != null && !connection.isClosed()) { +// public static void closeSilently(Connection connection) { +// try { +// if (connection != null && !connection.isClosed()) { +// +// connection.close(); +// +// } +// } catch (SQLException e) { +// if (log.isErrorEnabled()) { +// log.error("Could not close connection, but do not care", e); +// } +// } +// } - connection.close(); - - } - } catch (SQLException e) { - if (log.isErrorEnabled()) { - log.error("Could not close connection, but do not care", e); - } - } - } - public static Connection createConnection(Properties connectionProperties) throws SQLException { return createConnection( connectionProperties.getProperty(Environment.URL), @@ -305,21 +300,6 @@ return value; } - public static <N extends Number> N getValueOrComputedValue(N value, N computedValue) { - return value == null ? computedValue : value; - } - - public static <N extends Number> Boolean getValueOrComputedValueComputed(N value, N computedValue) { - Boolean result; - if (value == null) { - - result = computedValue == null ? null : true; - } else { - result = false; - } - return result; - } - public static void removeQualitativeValue(Collection<CaracteristicQualitativeValue> values, int id) { Iterator<CaracteristicQualitativeValue> iterator = values.iterator(); @@ -332,19 +312,6 @@ } } - /** - * Round the given value to max 4 digits. - * - * @param value the float to round. - * @return the rounded value - * @since 3.0-rc-1 - */ - public static float roundKiloGram(float value) { - BigDecimal sumB = new BigDecimal(value); - float result = sumB.abs(MATH_CONTEXT_4_DIGIT).floatValue(); - return result; - } - protected static class IdPredicate<B extends TuttiEntity> implements Predicate<B> { private final String id; @@ -455,17 +422,4 @@ return result; } - public static String getDuration(Date startDate, - Date endDate, - String format) { - String duration = ""; - if (startDate != null && endDate != null && !startDate.after(endDate)) { - duration = DurationFormatUtils.formatPeriod( - startDate.getTime(), - endDate.getTime(), - format); - } - return duration; - } - } Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-12-09 21:31:39 UTC (rev 1450) @@ -32,6 +32,7 @@ tutti.config.option.report.backup.directory.description= tutti.config.option.report.directory.description= tutti.config.option.report.home.directory.description= +tutti.config.option.report.log.directory.description= tutti.config.option.report.log.file.description= tutti.config.option.samplingCategoryOrderIds.description= tutti.config.option.site.url.description= Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationDataUtil; import fr.ifremer.shared.application.swing.tab.TabHandler; import fr.ifremer.shared.application.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -560,13 +559,13 @@ public void setDate(ActionEvent event, String property) { JXDatePicker field = (JXDatePicker) event.getSource(); Date value = field.getDate(); - Date date = (Date) ApplicationDataUtil.getProperty(getModel(), property); + Date date = (Date) TuttiEntities.getProperty(getModel(), property); if (value != null && date != null) { Calendar cal = DateUtils.toCalendar(date); value = DateUtils.setHours(value, cal.get(Calendar.HOUR_OF_DAY)); value = DateUtils.setMinutes(value, cal.get(Calendar.MINUTE)); } - ApplicationDataUtil.setProperty(getModel(), property, value); + TuttiEntities.setProperty(getModel(), property, value); } //------------------------------------------------------------------------// @@ -705,7 +704,7 @@ public String getTrawlDistanceTooltipText(Float trawlDistance) { String result = trawlDistance == null ? null : - _("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", ApplicationDataUtil.getDistanceInMilles(trawlDistance)); + _("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", TuttiEntities.getDistanceInMilles(trawlDistance)); return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -25,7 +25,6 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.ApplicationDataUtil; import fr.ifremer.shared.application.swing.tab.TabContentModel; import fr.ifremer.shared.application.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; @@ -924,7 +923,7 @@ if (getGearShootingStartLatitude() != null && getGearShootingStartLongitude() != null && getGearShootingEndLatitude() != null && getGearShootingEndLongitude() != null) { - Integer distance = ApplicationDataUtil.computeDistanceInMeters( + Integer distance = TuttiEntities.computeDistanceInMeters( getGearShootingStartLatitude(), getGearShootingStartLongitude(), getGearShootingEndLatitude(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-12-09 21:31:39 UTC (rev 1450) @@ -55,7 +55,7 @@ jaxx.runtime.swing.CardLayout2Ext static org.nuiton.i18n.I18n._ - static fr.ifremer.shared.application.ApplicationDataUtil.getWeightStringValue + static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue ]]></import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationDataUtil; import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import jaxx.runtime.JAXXUtil; @@ -320,12 +320,12 @@ } else if (computedNumber != null) { if (sampleCategory.hasOnlyOneFrequency()) { - text += ApplicationDataUtil.getWeightStringValue(computedNumber); + text += TuttiEntities.getWeightStringValue(computedNumber); } else { String color = Integer.toHexString(computedWeightColor.getRGB()).substring(2); text += "<em style='color: #" + color + "'>" + - ApplicationDataUtil.getWeightStringValue(computedNumber) + "</em>"; + TuttiEntities.getWeightStringValue(computedNumber) + "</em>"; } } else { text += "-"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -26,8 +26,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.ApplicationDataUtil; +import fr.ifremer.shared.application.swing.computable.ComputableData; import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; @@ -41,7 +42,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryAble; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyRowModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.swing.computable.ComputableData; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; @@ -339,8 +339,8 @@ public void setSampleCategoryValue(Integer sampleCategoryId, Serializable value) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - ApplicationDataUtil.setProperty(sampleCategory, - SampleCategory.PROPERTY_CATEGORY_VALUE, value); + TuttiEntities.setProperty(sampleCategory, + SampleCategory.PROPERTY_CATEGORY_VALUE, value); firePropertyChange(PROPERTY_SAMPLE_CATEGORY_VALUE, null, sampleCategory); } @@ -348,8 +348,8 @@ public void setSampleCategoryWeight(Integer sampleCategoryId, Object value) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - ApplicationDataUtil.setProperty(sampleCategory, - SampleCategory.PROPERTY_CATEGORY_WEIGHT, value); + TuttiEntities.setProperty(sampleCategory, + SampleCategory.PROPERTY_CATEGORY_WEIGHT, value); firePropertyChange(PROPERTY_SAMPLE_CATEGORY_WEIGHT, null, sampleCategory); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-12-09 21:31:39 UTC (rev 1450) @@ -40,7 +40,7 @@ java.awt.Color static org.nuiton.i18n.I18n._ - static fr.ifremer.shared.application.ApplicationDataUtil.getWeightStringValue + static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue ]]></import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-12-09 21:31:39 UTC (rev 1450) @@ -29,9 +29,6 @@ fr.ifremer.tutti.persistence.entities.referential.Caracteristic fr.ifremer.tutti.ui.swing.TuttiHelpBroker - fr.ifremer.tutti.ui.swing.TuttiUIContext - fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI - fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil @@ -45,11 +42,10 @@ javax.swing.SwingConstants java.awt.Color - java.awt.Dimension static org.nuiton.i18n.I18n._ static jaxx.runtime.SwingUtil.getStringValue - static fr.ifremer.shared.application.ApplicationDataUtil.getWeightStringValue + static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -27,7 +27,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationDataUtil; import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -428,7 +427,7 @@ List<BenthosFrequencyRowModel> rows = Lists.newArrayList(rowsByStep.values()); for (float i = minStep, step = model.getStep(); i <= maxStep; - i = ApplicationDataUtil.getRoundedLengthStep(i + step, true)) { + i = TuttiEntities.getRoundedLengthStep(i + step, true)) { if (!existingKeys.contains(i)) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -234,7 +234,7 @@ @Override public void keyReleased(KeyEvent e) { String value = textField.getText(); - ApplicationDataUtil.setProperty(editorModel, CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, value); + TuttiEntities.setProperty(editorModel, CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, value); } }); editor = textField; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.shared.application.ApplicationDataUtil; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -491,7 +492,7 @@ public void setSampleCategoryValue(Integer sampleCategoryId, Serializable value) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - ApplicationDataUtil.setProperty(sampleCategory, + TuttiEntities.setProperty(sampleCategory, SampleCategory.PROPERTY_CATEGORY_VALUE, value); firePropertyChange(PROPERTY_SAMPLE_CATEGORY_VALUE, null, sampleCategory); } @@ -500,8 +501,8 @@ public void setSampleCategoryWeight(Integer sampleCategoryId, Object value) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - ApplicationDataUtil.setProperty(sampleCategory, - SampleCategory.PROPERTY_CATEGORY_WEIGHT, value); + TuttiEntities.setProperty(sampleCategory, + SampleCategory.PROPERTY_CATEGORY_WEIGHT, value); firePropertyChange(PROPERTY_SAMPLE_CATEGORY_WEIGHT, null, sampleCategory); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2013-12-09 21:31:39 UTC (rev 1450) @@ -40,7 +40,7 @@ java.awt.Color static org.nuiton.i18n.I18n._ - static fr.ifremer.shared.application.ApplicationDataUtil.getWeightStringValue + static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue ]]></import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-12-09 21:31:39 UTC (rev 1450) @@ -29,9 +29,6 @@ fr.ifremer.tutti.persistence.entities.referential.Caracteristic fr.ifremer.tutti.ui.swing.TuttiHelpBroker - fr.ifremer.tutti.ui.swing.TuttiUIContext - fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI - fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil @@ -45,11 +42,10 @@ javax.swing.SwingConstants java.awt.Color - java.awt.Dimension static org.nuiton.i18n.I18n._ static jaxx.runtime.SwingUtil.getStringValue - static fr.ifremer.shared.application.ApplicationDataUtil.getWeightStringValue + static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-12-09 21:14:50 UTC (rev 1449) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-12-09 21:31:39 UTC (rev 1450) @@ -27,7 +27,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationDataUtil; import fr.ifremer.shared.application.swing.util.Cancelable; import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -426,7 +425,7 @@ List<SpeciesFrequencyRowModel> rows = Lists.newArrayList(rowsByStep.values()); for (float i = minStep, step = model.getStep(); i <= maxStep; - i = ApplicationDataUtil.getRoundedLengthStep(i + step, true)) { + i = TuttiEntities.getRoundedLengthStep(i + step, true)) { if (!existingKeys.contains(i)) {

1 0