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

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

[ANN] - Ifremer shared 1.0.1 released
by forge.codelutin.com Release Notification Dec. 9, 2013

Dec. 9, 2013

The Ifremer shared team is pleased to announce the shared-pom-1.0.1 release! Module commun à l'écriture d'applications Ifremer. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti/ifremer-shared-application Changes ------- Changes in this version include: Fixed Bugs: o Can't convert table model coordinate when no selection Issue: 3945. Thanks to Tony Chemit. Resolved by tchemit. Changes: o Add useful methods on ApplicationDataUtil class Issue: 3949. Thanks to Tony Chemit. Resolved by tchemit. o Clean poms Issue: 3948. Thanks to Tony Chemit. Resolved by tchemit. o deploy to tutti third-parties repository (and not ohter-releases) Issue: 3947. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Ifremer shared team

1 0

r1449 - in application/trunk: . application application-swing
by maven-release＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: maven-release Date: 2013-12-09 22:14:50 +0100 (Mon, 09 Dec 2013) New Revision: 1449 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1449 Log: [maven-release-plugin] prepare for next development iteration Modified: application/trunk/application-swing/pom.xml application/trunk/application/pom.xml application/trunk/pom.xml Modified: application/trunk/application/pom.xml =================================================================== --- application/trunk/application/pom.xml 2013-12-09 21:14:42 UTC (rev 1448) +++ application/trunk/application/pom.xml 2013-12-09 21:14:50 UTC (rev 1449) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer.shared</groupId> <artifactId>shared-pom</artifactId> - <version>1.0.1</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>application</artifactId> Modified: application/trunk/application-swing/pom.xml =================================================================== --- application/trunk/application-swing/pom.xml 2013-12-09 21:14:42 UTC (rev 1448) +++ application/trunk/application-swing/pom.xml 2013-12-09 21:14:50 UTC (rev 1449) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer.shared</groupId> <artifactId>shared-pom</artifactId> - <version>1.0.1</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> Modified: application/trunk/pom.xml =================================================================== --- application/trunk/pom.xml 2013-12-09 21:14:42 UTC (rev 1448) +++ application/trunk/pom.xml 2013-12-09 21:14:50 UTC (rev 1449) @@ -33,7 +33,7 @@ <groupId>fr.ifremer.shared</groupId> <artifactId>shared-pom</artifactId> - <version>1.0.1</version> + <version>1.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Ifremer shared</name> @@ -76,12 +76,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/application/tags/ifremer-shared-1.…</url> + <url>http://svn.forge.codelutin.com/svn/tutti/application/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/application/tags/ifremer-s… + scm:svn:http://svn.forge.codelutin.com/svn/tutti/application/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/application/tags/ifremer-s… + scm:svn:http://svn.forge.codelutin.com/svn/tutti/application/trunk </developerConnection> </scm> <distributionManagement>

1 0

r1448 - application/tags
by maven-release＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: maven-release Date: 2013-12-09 22:14:42 +0100 (Mon, 09 Dec 2013) New Revision: 1448 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1448 Log: [maven-release-plugin] copy for tag ifremer-shared-1.0.1 Added: application/tags/ifremer-shared-1.0.1/

1 0

r1447 - in application/trunk: . application application-swing
by maven-release＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: maven-release Date: 2013-12-09 22:14:33 +0100 (Mon, 09 Dec 2013) New Revision: 1447 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1447 Log: [maven-release-plugin] prepare release ifremer-shared-1.0.1 Modified: application/trunk/application-swing/pom.xml application/trunk/application/pom.xml application/trunk/pom.xml Modified: application/trunk/application/pom.xml =================================================================== --- application/trunk/application/pom.xml 2013-12-09 21:08:11 UTC (rev 1446) +++ application/trunk/application/pom.xml 2013-12-09 21:14:33 UTC (rev 1447) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer.shared</groupId> <artifactId>shared-pom</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <artifactId>application</artifactId> Modified: application/trunk/application-swing/pom.xml =================================================================== --- application/trunk/application-swing/pom.xml 2013-12-09 21:08:11 UTC (rev 1446) +++ application/trunk/application-swing/pom.xml 2013-12-09 21:14:33 UTC (rev 1447) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer.shared</groupId> <artifactId>shared-pom</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> </parent> <artifactId>application-swing</artifactId> Modified: application/trunk/pom.xml =================================================================== --- application/trunk/pom.xml 2013-12-09 21:08:11 UTC (rev 1446) +++ application/trunk/pom.xml 2013-12-09 21:14:33 UTC (rev 1447) @@ -33,7 +33,7 @@ <groupId>fr.ifremer.shared</groupId> <artifactId>shared-pom</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.0.1</version> <packaging>pom</packaging> <name>Ifremer shared</name> @@ -76,12 +76,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/application/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/application/tags/ifremer-shared-1.…</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/application/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/application/tags/ifremer-s… </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/application/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/application/tags/ifremer-s… </developerConnection> </scm> <distributionManagement>

1 0

r1446 - in application/trunk: . application application-swing
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:08:11 +0100 (Mon, 09 Dec 2013) New Revision: 1446 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1446 Log: fixes #3947: deploy to tutti third-parties repository (and not ohter-releases) fixes #3948: Clean poms Modified: application/trunk/application-swing/pom.xml application/trunk/application/pom.xml application/trunk/pom.xml Modified: application/trunk/application/pom.xml =================================================================== --- application/trunk/application/pom.xml 2013-12-09 21:07:45 UTC (rev 1445) +++ application/trunk/application/pom.xml 2013-12-09 21:08:11 UTC (rev 1446) @@ -33,65 +33,60 @@ <artifactId>application</artifactId> <name>Ifremer shared :: Application</name> - <properties> - - </properties> - <dependencies> +  <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs2</artifactId> + </dependency> +  <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> +  <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> </dependency> -  - +  <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency>  - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> <scope>provided</scope> </dependency> +  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -109,7 +104,6 @@ <execution> <goals> <goal>parserJava</goal> - <goal>parserValidation</goal> <goal>gen</goal> </goals> </execution> Modified: application/trunk/application-swing/pom.xml =================================================================== --- application/trunk/application-swing/pom.xml 2013-12-09 21:07:45 UTC (rev 1445) +++ application/trunk/application-swing/pom.xml 2013-12-09 21:08:11 UTC (rev 1446) @@ -55,101 +55,93 @@ <dependencies> +  <dependency> <groupId>${project.groupId}</groupId> <artifactId>application</artifactId> <version>${project.version}</version> </dependency> +  <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-csv</artifactId> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>runtime</scope> </dependency> +  <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> +  <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> </dependency> - -  <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>runtime</scope> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> -  +  <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> </dependency> - <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> </dependency> -  - +  <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> - <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> - <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-autocomplete</artifactId> </dependency>  - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jcl</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>runtime</scope> </dependency> +  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -179,13 +171,13 @@ <executions> <execution> <id>scan-sources</id> -  + </configuration> <goals> <goal>parserJava</goal> <goal>parserValidation</goal> Modified: application/trunk/pom.xml =================================================================== --- application/trunk/pom.xml 2013-12-09 21:07:45 UTC (rev 1445) +++ application/trunk/pom.xml 2013-12-09 21:08:11 UTC (rev 1446) @@ -40,7 +40,9 @@ <description> Module commun à l'écriture d'applications Ifremer. </description> - <url>http://forge.codelutin.com/projects/tutti/ifremer-shared-application</url> + <url> + http://forge.codelutin.com/projects/tutti/ifremer-shared-application + </url> <inceptionYear>2013</inceptionYear> <organization> <name>Ifremer</name> @@ -85,8 +87,16 @@ <distributionManagement> <site> <id>${platform}</id> - <url>${our.site.repository}/tutti/ifremer-shared-application/${projectId}</url> + <url> + ${our.site.repository}/tutti/ifremer-shared-application/${projectId} + </url> </site> + <repository> + <id>nuiton-nexus-deploy</id> + <url> + http://nexus.nuiton.org/nexus/content/repositories/tutti-third-parties + </url> + </repository> <snapshotRepository> <id>nuiton-nexus-deploy</id> <url> @@ -97,52 +107,32 @@ <properties> +  <platform>forge.codelutin.com</platform> <projectId>tutti</projectId> - <redmine.versionId>ifremer-shared-application-1.0</redmine.versionId> + <redmine.versionId> + ifremer-shared-application-${project.version} + </redmine.versionId>  -  -  -  -  + <maven.compiler.source>1.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> -  +  <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> - <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> - <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion> - <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> - <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> - <jaxxVersion>2.6</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> - - <xworkVersion>2.3.15.1</xworkVersion> - <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> - <slf4jVersion>1.7.5</slf4jVersion> - <hibernateVersion>3.6.10.Final</hibernateVersion> - <adagioVersion>3.4.0-1</adagioVersion> - <birtVersion>4.2.1a</birtVersion> - - <bluecoveVersion>2.1.0</bluecoveVersion> - +  <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> -  - <locales>fr</locales> - -  +  + <locales>fr</locales>  <relativizeDecorationLinks>false</relativizeDecorationLinks>  @@ -183,57 +173,63 @@ <dependencyManagement> <dependencies> -  +  + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs2</artifactId> + <version>2.0</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-svnexe</artifactId> + </exclusion> + </exclusions> + </dependency> +  <dependency> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - <version>1.3</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guavaVersion}</version> </dependency> +  <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-profiling</artifactId> <version>2.7.1</version> </dependency> - <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-csv</artifactId> - <version>${nuitonCsvVersion}</version> + <version>3.0-alpha-1</version> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guavaVersion}</version> - </dependency> - - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> </dependency> -  +  <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> @@ -272,52 +268,6 @@ <version>${swingXVersion}</version> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> - <version>2.0</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-provider-svnexe</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ifremer.adagio</groupId> - <artifactId>adagio-core-allegro</artifactId> - <version>${adagioVersion}</version> - <exclusions> - <exclusion> - <groupId>org.andromda.profiles.emf.uml2</groupId> - <artifactId>andromda-profile-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-spring-cartridge</artifactId> - </exclusion> - <exclusion> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-hibernate-cartridge</artifactId> - </exclusion> - <exclusion> - <groupId>org.andromda.cartridges</groupId> - <artifactId>andromda-java-cartridge</artifactId> - </exclusion> - </exclusions> - </dependency> -  <dependency> <groupId>org.slf4j</groupId> @@ -331,120 +281,6 @@ <version>${slf4jVersion}</version> </dependency> -  - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - <version>${spring.version}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commonsIoVersion}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.birt.runtime</groupId> - <artifactId>org.eclipse.birt.runtime</artifactId> - <version>${birtVersion}</version> - <exclusions> - <exclusion> - <groupId>milyn</groupId> - <artifactId>flute</artifactId> - </exclusion> - <exclusion> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>${jdbc.hsqldb.version}</version> - </dependency> - - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>${hsqldb.version}</version> - </dependency> - - <dependency> - <groupId>com.esotericsoftware.yamlbeans</groupId> - <artifactId>yamlbeans</artifactId> - <version>1.06</version> - </dependency> - - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.9.5</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>itextpdf</artifactId> - <version>5.4.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.xhtmlrenderer</groupId> - <artifactId>flying-saucer-pdf-itext5</artifactId> - <version>9.0.2</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.19</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>net.sf.bluecove</groupId> - <artifactId>bluecove</artifactId> - <version>${bluecoveVersion}</version> - </dependency> - - <dependency> - <groupId>net.sf.bluecove</groupId> - <artifactId>bluecove-gpl</artifactId> - <version>${bluecoveVersion}</version> - </dependency> - </dependencies> </dependencyManagement>

1 0

r1445 - application/trunk/application/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:07:45 +0100 (Mon, 09 Dec 2013) New Revision: 1445 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1445 Log: fix i18n Modified: application/trunk/application/src/main/resources/i18n/application_en_GB.properties Modified: application/trunk/application/src/main/resources/i18n/application_en_GB.properties =================================================================== --- application/trunk/application/src/main/resources/i18n/application_en_GB.properties 2013-12-09 21:07:13 UTC (rev 1444) +++ application/trunk/application/src/main/resources/i18n/application_en_GB.properties 2013-12-09 21:07:45 UTC (rev 1445) @@ -3,5 +3,5 @@ application.common.unit.kg=Kilogram application.common.unit.short.g=g application.common.unit.short.kg=kg -application.property.get.error= -application.property.set.error= +application.property.get.error=Property %1s not found on object of type %2s +application.property.set.error=Property %1s not found on object of type %2s

1 0

r1444 - application/trunk/application/src/main/java/fr/ifremer/shared/application
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:07:13 +0100 (Mon, 09 Dec 2013) New Revision: 1444 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1444 Log: fixes #3949: Add useful methods on ApplicationDataUtil class Modified: application/trunk/application/src/main/java/fr/ifremer/shared/application/ApplicationDataUtil.java Modified: application/trunk/application/src/main/java/fr/ifremer/shared/application/ApplicationDataUtil.java =================================================================== --- application/trunk/application/src/main/java/fr/ifremer/shared/application/ApplicationDataUtil.java 2013-12-09 21:06:07 UTC (rev 1443) +++ application/trunk/application/src/main/java/fr/ifremer/shared/application/ApplicationDataUtil.java 2013-12-09 21:07:13 UTC (rev 1444) @@ -26,9 +26,13 @@ import com.google.common.base.Preconditions; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; +import java.math.BigDecimal; +import java.math.MathContext; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; +import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -46,6 +50,8 @@ public static final double EARTH_RADIUS = 6378288.0; + private static final MathContext MATH_CONTEXT_4_DIGIT = new MathContext(4); + private static DecimalFormatSymbols symbols; private static DecimalFormat decimalFormat; @@ -135,4 +141,45 @@ } return textValue; } + + 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; + } + + /** + * Round the given value to max 4 digits. + * + * @param value the float to round. + * @return the rounded value + * @since 1.0.1 + */ + public static float roundKiloGram(float value) { + BigDecimal sumB = new BigDecimal(value); + float result = sumB.abs(MATH_CONTEXT_4_DIGIT).floatValue(); + 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; + } }

1 0

r1443 - application/trunk/application-swing/src/main/java/fr/ifremer/shared/application/swing
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 22:06:07 +0100 (Mon, 09 Dec 2013) New Revision: 1443 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1443 Log: fixes #3945: Can't convert table model coordinate when no selection Modified: application/trunk/application-swing/src/main/java/fr/ifremer/shared/application/swing/AbstractApplicationUIHandler.java Modified: application/trunk/application-swing/src/main/java/fr/ifremer/shared/application/swing/AbstractApplicationUIHandler.java =================================================================== --- application/trunk/application-swing/src/main/java/fr/ifremer/shared/application/swing/AbstractApplicationUIHandler.java 2013-12-09 20:26:14 UTC (rev 1442) +++ application/trunk/application-swing/src/main/java/fr/ifremer/shared/application/swing/AbstractApplicationUIHandler.java 2013-12-09 21:06:07 UTC (rev 1443) @@ -438,8 +438,8 @@ if (rightClick) { // use now model coordinate - int modelRowIndex = source.convertRowIndexToModel(rowIndex); - int modelColumnIndex = source.convertColumnIndexToModel(columnIndex); + int modelRowIndex = rowIndex == -1 ? -1 : source.convertRowIndexToModel(rowIndex); + int modelColumnIndex = columnIndex == -1 ? -1 : source.convertColumnIndexToModel(columnIndex); beforeOpenPopup(modelRowIndex, modelColumnIndex); @@ -909,6 +909,7 @@ return result; } + //FIXME Move this in JAXX protected <B> void changeValidatorContext(String newContext, SwingValidator<B> validator) { B bean = validator.getBean();

1 0

r1442 - trunk
by tchemit＠users.forge.codelutin.com Dec. 9, 2013

Dec. 9, 2013

Author: tchemit Date: 2013-12-09 21:26:14 +0100 (Mon, 09 Dec 2013) New Revision: 1442 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1442 Log: refs #3946: Utiliser ifremer-shared 1.0.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-09 20:13:47 UTC (rev 1441) +++ trunk/pom.xml 2013-12-09 20:26:14 UTC (rev 1442) @@ -120,7 +120,7 @@  - <ifremerApplicationVersion>1.0</ifremerApplicationVersion> + <ifremerApplicationVersion>1.1-SNAPSHOT</ifremerApplicationVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion>

1 0