[tutti] branch develop updated (4cfd7b8 -> af10d2f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 4cfd7b8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 2559339 updates nuiton-config to 3.0-rc-1 updates nuiton-utils to 3.0-rc-5 updates adagio to 3.6.2-SNAPSHOT updates jaxx to 2.11-SNAPSHOT use new Version and Jaxx API new 7de707e use nuiton-updater, nuiton-utils snapshot + fix some deprecated codes new af10d2f Merge branch 'feature/updatesLibs' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit af10d2f5d5c2ac78d20b6f956524400eeae92bd8 Merge: 4cfd7b8 7de707e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 13:24:58 2014 +0200 Merge branch 'feature/updatesLibs' into develop commit 7de707e6a6054e0f7e4212d2fc47c87e081bb9eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 13:23:01 2014 +0200 use nuiton-updater, nuiton-utils snapshot + fix some deprecated codes commit 2559339caf4114a5714d2b2e1745d8cfec1a18b7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 09:50:08 2014 +0200 updates nuiton-config to 3.0-rc-1 updates nuiton-utils to 3.0-rc-5 updates adagio to 3.6.2-SNAPSHOT updates jaxx to 2.11-SNAPSHOT use new Version and Jaxx API Summary of changes: pom.xml | 16 ++++++++-------- tutti-persistence/pom.xml | 1 + .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../service/AccidentalBatchPersistenceServiceImpl.java | 2 +- ...IndividualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/ReferentialPersistenceServiceImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 8 ++++---- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../ifremer/tutti/persistence/test/DatabaseFixtures.java | 8 ++++---- .../src/main/xmi/tutti-persistence.properties | 7 +------ .../tutti/persistence/TuttiPersistenceWriteTest.java | 2 +- .../persistence/config/TuttiPersistenceConfigTest.java | 2 +- .../fr/ifremer/tutti/service/PersistenceService.java | 2 +- .../fr/ifremer/tutti/service/AbstractServiceTest.java | 3 +-- .../java/fr/ifremer/tutti/service/UpdateSchemaTest.java | 2 +- tutti-ui-swing/pom.xml | 7 ++++--- .../java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/ImportDbAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/OpenDbAction.java | 2 +- .../tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 8 ++++---- 25 files changed, 44 insertions(+), 48 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 2559339caf4114a5714d2b2e1745d8cfec1a18b7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 09:50:08 2014 +0200 updates nuiton-config to 3.0-rc-1 updates nuiton-utils to 3.0-rc-5 updates adagio to 3.6.2-SNAPSHOT updates jaxx to 2.11-SNAPSHOT use new Version and Jaxx API --- pom.xml | 14 +++++++------- tutti-persistence/pom.xml | 1 + .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../service/AccidentalBatchPersistenceServiceImpl.java | 2 +- .../IndividualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/ReferentialPersistenceServiceImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 4 ++-- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../ifremer/tutti/persistence/test/DatabaseFixtures.java | 4 ++-- .../src/main/xmi/tutti-persistence.properties | 7 +------ .../tutti/persistence/TuttiPersistenceWriteTest.java | 2 +- .../java/fr/ifremer/tutti/service/PersistenceService.java | 2 +- .../java/fr/ifremer/tutti/service/UpdateSchemaTest.java | 2 +- tutti-ui-swing/pom.xml | 7 ++++--- .../fr/ifremer/tutti/ui/swing/action/ImportDbAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/OpenDbAction.java | 2 +- .../tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css | 8 ++++---- 22 files changed, 36 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index bdaedfb..868e287 100644 --- a/pom.xml +++ b/pom.xml @@ -133,13 +133,13 @@ <signatureVersion>1.0</signatureVersion> <!-- libraries version --> - <nuitonI18nVersion>3.1</nuitonI18nVersion> + <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> - <eugenePluginVersion>2.10</eugenePluginVersion> - <jaxxVersion>2.8.6</jaxxVersion> + <eugenePluginVersion>2.13</eugenePluginVersion> + <jaxxVersion>2.11-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.6</slf4jVersion> - <adagioVersion>3.5.5</adagioVersion> + <adagioVersion>3.6.2-SNAPSHOT</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.1.Final</hibernateVersion> <springVersion>4.0.1.RELEASE</springVersion> @@ -227,7 +227,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-2</version> + <version>3.0-rc-5</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -237,7 +237,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-rc-1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -247,7 +247,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>3.0-alpha-3</version> + <version>3.0-rc-4</version> </dependency> <dependency> <groupId>org.nuiton.i18n</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 0229118..6f37fa4 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -208,6 +208,7 @@ <fullPackagePath>fr.ifremer.tutti.persistence.entities </fullPackagePath> <inputs>zargo</inputs> + <failIfUnsafe>true</failIfUnsafe> </configuration> <goals> <goal>generate</goal> diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index 71475d3..f9d3c6a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -40,7 +40,7 @@ import org.nuiton.config.ConfigOptionDef; import org.nuiton.jaxx.application.ApplicationConfiguration; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import javax.swing.KeyStroke; import java.awt.Color; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index a015f20..94c814f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import org.hibernate.dialect.HSQLDialect; import org.hsqldb.jdbcDriver; import org.nuiton.config.ConfigOptionDef; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import javax.swing.KeyStroke; import java.awt.Color; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index cb34649..01e1d5f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -69,7 +69,7 @@ import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import javax.annotation.Resource; import java.io.File; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index d2eea12..e521e56 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -49,7 +49,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.persistence.entities.referential.Vessel; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import java.io.File; import java.io.IOException; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java index 5ddd486..9001809 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java @@ -220,7 +220,7 @@ public class AccidentalBatchPersistenceServiceImpl extends AbstractPersistenceSe // Recorder Departement target.setRecorderDepartment(load(DepartmentImpl.class, - DepartmentId.UNKOWN_RECODER_DEPARTMENT.getValue())); + DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.getValue())); // Recorder Person target.setRecorderPerson(load(PersonImpl.class, diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java index 6e7eb91..56b26a2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java @@ -249,7 +249,7 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe // Recorder Departement target.setRecorderDepartment(load(DepartmentImpl.class, - DepartmentId.UNKOWN_RECODER_DEPARTMENT.getValue())); + DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.getValue())); // Recorder Person target.setRecorderPerson(load(PersonImpl.class, diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java index 16130d2..f459d0d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java @@ -958,7 +958,7 @@ public class ReferentialPersistenceServiceImpl extends AbstractPersistenceServic Preconditions.checkNotNull(source.getFirstName()); Preconditions.checkNotNull(source.getLastName()); - fr.ifremer.adagio.core.dao.administration.user.Person target = personDao.createAsTemporary(source.getLastName(), source.getFirstName(), DepartmentId.UNKOWN_RECODER_DEPARTMENT.getValue()); + fr.ifremer.adagio.core.dao.administration.user.Person target = personDao.createAsTemporary(source.getLastName(), source.getFirstName(), DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.getValue()); // Fill the result bean Person result = Persons.newPerson(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceService.java index 87cc421..3292e44 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceService.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.persistence.service; */ import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import org.springframework.transaction.annotation.Transactional; import java.util.concurrent.Callable; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java index f067daa..2e0807b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java @@ -30,8 +30,8 @@ import fr.ifremer.adagio.core.service.technical.sanity.DatabaseSanityService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.VersionUtil; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java index 01f559f..c2aadba 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java @@ -386,6 +386,6 @@ public class MeasurementPersistenceHelper extends AbstractPersistenceService { public Integer getRecorderDepartmentId() { // TODO BL : voir si on peut récupérer le departement (du 1er saisisseur ?) - return DepartmentId.UNKOWN_RECODER_DEPARTMENT.getValue(); + return DepartmentId.UNKNOWN_RECORDER_DEPARTMENT.getValue(); } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java index 4368f88..e5bff5a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java @@ -53,8 +53,8 @@ import fr.ifremer.tutti.persistence.service.ProgramPersistenceService; import fr.ifremer.tutti.persistence.service.ReferentialPersistenceService; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.junit.Assert; -import org.nuiton.util.Version; -import org.nuiton.util.VersionUtil; +import org.nuiton.util.version.Version; +import org.nuiton.util.version.VersionUtil; import java.io.Serializable; import java.util.Calendar; diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.properties b/tutti-persistence/src/main/xmi/tutti-persistence.properties index 44bc3ce..a69a326 100644 --- a/tutti-persistence/src/main/xmi/tutti-persistence.properties +++ b/tutti-persistence/src/main/xmi/tutti-persistence.properties @@ -23,14 +23,9 @@ ### model.tagvalue.version=1.3 -model.tagvalue.constantPrefix=PROPERTY_ -model.tagvalue.doNotGenerateBooleanGetMethods=true -model.tagvalue.noPCS=true +model.tagvalue.generatePropertyChangeSupport=false model.tagvalue.simpleBeanSuperClass=fr.ifremer.tutti.persistence.entities.TuttiEntityBean -model.tagvalue.simpleBeanClassNameSuffix=Bean -model.tagvalue.simpleBeanGenerateInterface=true model.tagvalue.simpleBeanInterfaceSuperClass=fr.ifremer.tutti.persistence.entities.TuttiEntity -model.tagvalue.simpleBeanGenerateDefaults=true fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol.attribute.mandatorySampleCategoryId.stereotype=ordered diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java index 57260ee..9997537 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/TuttiPersistenceWriteTest.java @@ -29,7 +29,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * @author tchemit <chemit@codelutin.com> diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index 3db6312..055be4a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -73,7 +73,7 @@ import org.apache.commons.vfs2.FileType; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.util.TimeLog; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import java.io.File; import java.io.IOException; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java index 3241724..4bdc464 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/UpdateSchemaTest.java @@ -29,7 +29,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; /** * Pour mettre à jour le schéma d'une base de test. diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index c19307f..9e2e246 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -62,11 +62,11 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker </jaxx.helpBrokerFQN> - <i18n.bundleOutputName>tutti-i18n</i18n.bundleOutputName> - <i18n.generateCsvFile>true</i18n.generateCsvFile> + <i18n.bundleOutputName>${projectId}-i18n</i18n.bundleOutputName> <i18n.bundleCsvFile> - ${project.build.directory}/generated-sources/resources/META-INF/${i18n.bundleOutputName}.csv + ${project.build.directory}/generated-sources/resources/META-INF/${projectId}-i18n.csv </i18n.bundleCsvFile> + <i18n.bundleCsvSeparator>|</i18n.bundleCsvSeparator> <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> @@ -341,6 +341,7 @@ <id>make-bundle</id> <goals> <goal>bundle</goal> + <goal>generate-csv-bundle</goal> </goals> </execution> </executions> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java index 4b37d35..66d3b97 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java @@ -31,7 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import javax.swing.JOptionPane; import java.io.File; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java index 4058040..c455861 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java @@ -35,7 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.updater.ApplicationInfo; import org.nuiton.updater.ApplicationUpdater; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import javax.swing.JOptionPane; import java.io.File; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java index ce54a8b..689ba0c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java @@ -33,7 +33,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.updater.ApplicationInfo; import org.nuiton.updater.ApplicationUpdater; -import org.nuiton.util.Version; +import org.nuiton.util.version.Version; import javax.swing.JComponent; import javax.swing.SwingUtilities; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css index a737c66..0f17201 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css @@ -56,7 +56,7 @@ BeanFilterableComboBox { } #editProgramComboBox { - model: {handler.newComboModel(editProgramButton, exportProgramButton)}; + model: {SwingUtil.newComboModel(editProgramButton, exportProgramButton)}; enabled: {model.isProgramFound()}; renderer: {new ActionListCellRenderer()}; } @@ -103,7 +103,7 @@ BeanFilterableComboBox { } #editCruiseComboBox { - model: {handler.newComboModel(editCruiseButton, exportCruiseButton, sendCruiseReportButton, exportCruiseForSumatraButton)}; + model: {SwingUtil.newComboModel(editCruiseButton, exportCruiseButton, sendCruiseReportButton, exportCruiseForSumatraButton)}; enabled: {model.isProgramFound() && model.isCruiseFound()}; renderer: {new ActionListCellRenderer()}; } @@ -167,12 +167,12 @@ BeanFilterableComboBox { } #newProtocolComboBox { - model: {handler.newComboModel(newProtocolButton, importProtocolButton)}; + model: {SwingUtil.newComboModel(newProtocolButton, importProtocolButton)}; renderer: {new ActionListCellRenderer()}; } #editProtocolComboBox { - model: {handler.newComboModel(editProtocolButton, cloneProtocolButton, exportProtocolButton, deleteProtocolButton)}; + model: {SwingUtil.newComboModel(editProtocolButton, cloneProtocolButton, exportProtocolButton, deleteProtocolButton)}; enabled: {model.isProtocolFound()}; renderer: {new ActionListCellRenderer()}; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7de707e6a6054e0f7e4212d2fc47c87e081bb9eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 13:23:01 2014 +0200 use nuiton-updater, nuiton-utils snapshot + fix some deprecated codes --- pom.xml | 4 ++-- .../tutti/persistence/service/TechnicalPersistenceServiceImpl.java | 6 +++--- .../java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java | 6 +++--- .../tutti/persistence/config/TuttiPersistenceConfigTest.java | 2 +- .../src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java | 3 +-- .../src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 868e287..85cde34 100644 --- a/pom.xml +++ b/pom.xml @@ -227,7 +227,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-5</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -242,7 +242,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-updater</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java index 2e0807b..831819c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionUtil; +import org.nuiton.util.version.VersionBuilder; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -87,13 +87,13 @@ public class TechnicalPersistenceServiceImpl extends AbstractPersistenceService } version = null; } - return version == null ? null : VersionUtil.valueOf(version.toString()); + return version == null ? null : VersionBuilder.create(version.toString()).build(); } @Override public Version getApplicationVersion() { fr.ifremer.adagio.core.dao.technical.Version version = databaseSchemaDao.getSchemaVersionIfUpdate(); - return VersionUtil.valueOf(version.toString()); + return VersionBuilder.create(version.toString()).build(); } @Override diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java index e5bff5a..1a372ba 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java @@ -54,7 +54,7 @@ import fr.ifremer.tutti.persistence.service.ReferentialPersistenceService; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.junit.Assert; import org.nuiton.util.version.Version; -import org.nuiton.util.version.VersionUtil; +import org.nuiton.util.version.VersionBuilder; import java.io.Serializable; import java.util.Calendar; @@ -71,11 +71,11 @@ import java.util.List; public class DatabaseFixtures { public Version lastAdagioSchemaVersion() { - return VersionUtil.valueOf("3.5.0"); + return VersionBuilder.create("3.5.0").build(); } public Version currentAdagioSchemaVersion() { - return VersionUtil.valueOf("3.2.1.01"); + return VersionBuilder.create("3.2.1.01").build(); } public String programCode() { diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java index 45ea4f1..98e159c 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java @@ -35,7 +35,7 @@ import org.junit.rules.TestName; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import java.io.File; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java index 1c25b43..223d6d9 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/AbstractServiceTest.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.TuttiConfigurationOption; -import fr.ifremer.tutti.persistence.RessourceClassLoader; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; @@ -32,7 +31,7 @@ import org.junit.Rule; import org.junit.rules.TestName; import org.nuiton.config.ApplicationConfig; import org.nuiton.util.FileUtil; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import java.io.File; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 2f81d08..9e89567 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -79,7 +79,7 @@ import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; -import org.nuiton.util.converter.ConverterUtil; +import org.nuiton.converter.ConverterUtil; import javax.swing.JOptionPane; import java.awt.Color; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit af10d2f5d5c2ac78d20b6f956524400eeae92bd8 Merge: 4cfd7b8 7de707e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 13:24:58 2014 +0200 Merge branch 'feature/updatesLibs' into develop pom.xml | 16 ++++++++-------- tutti-persistence/pom.xml | 1 + .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../service/AccidentalBatchPersistenceServiceImpl.java | 2 +- ...IndividualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/ReferentialPersistenceServiceImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 8 ++++---- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../ifremer/tutti/persistence/test/DatabaseFixtures.java | 8 ++++---- .../src/main/xmi/tutti-persistence.properties | 7 +------ .../tutti/persistence/TuttiPersistenceWriteTest.java | 2 +- .../persistence/config/TuttiPersistenceConfigTest.java | 2 +- .../fr/ifremer/tutti/service/PersistenceService.java | 2 +- .../fr/ifremer/tutti/service/AbstractServiceTest.java | 3 +-- .../java/fr/ifremer/tutti/service/UpdateSchemaTest.java | 2 +- tutti-ui-swing/pom.xml | 7 ++++--- .../java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/ImportDbAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/OpenDbAction.java | 2 +- .../tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 8 ++++---- 25 files changed, 44 insertions(+), 48 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm