branch develop updated (876198c -> 7ab9261)
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 876198c [jgitflow-maven-plugin]Updating develop poms back to pre merge state new f177807 fixes #6377: Impossible d'ajouter une caractéristique de type qualitative (onglet observations individuelles) dans le protocole new c0a931e fixes #6378: [CAPTURE] erreur import fichier trait new 7ab9261 fixes #5738: [TECH] faire en sorte que les messages d'erreur reste DEVANT afin de pouvoir les consulter 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 7ab926117776cf7a002ad0011b2bf5ca7119740c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 5 16:15:32 2015 +0100 fixes #5738: [TECH] faire en sorte que les messages d'erreur reste DEVANT afin de pouvoir les consulter commit c0a931ea11b66e5aee516d43950c904d540a22c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 5 16:14:35 2015 +0100 fixes #6378: [CAPTURE] erreur import fichier trait commit f177807997c4e595ee84c5767214f93bd549b568 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 5 14:35:43 2015 +0100 fixes #6377: Impossible d'ajouter une caractéristique de type qualitative (onglet observations individuelles) dans le protocole Summary of changes: pom.xml | 2 +- .../tutti/service/operationimport/ImportFromColumnFileModel.java | 4 +--- .../create/CreateIndividualObservationBatchUIHandler.java | 6 +++--- 3 files changed, 5 insertions(+), 7 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 f177807997c4e595ee84c5767214f93bd549b568 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 5 14:35:43 2015 +0100 fixes #6377: Impossible d'ajouter une caractéristique de type qualitative (onglet observations individuelles) dans le protocole --- .../create/CreateIndividualObservationBatchUIHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java index 594b8f3..cdd7cb0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java @@ -42,6 +42,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.Table; +import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; @@ -49,7 +50,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import org.nuiton.jaxx.application.ApplicationDataUtil; import org.nuiton.jaxx.application.swing.util.Cancelable; import javax.swing.JComponent; @@ -167,11 +167,11 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa String name = caracteristic.getId() + "CaracteristicField"; numberEditor.setName(name); numberEditor.setProperty(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY); -// numberEditor.setUseFloat(true); numberEditor.setShowReset(true); numberEditor.setBean(editorModel); numberEditor.setAutoPopup(getConfig().isAutoPopupNumberEditor()); numberEditor.setShowPopupButton(getConfig().isShowNumberEditorButton()); + numberEditor.setNumberType(Float.class); numberEditor.setNumberPattern(TuttiUI.DECIMAL3_PATTERN); editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, new PropertyChangeListener() { @@ -231,7 +231,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa @Override public void keyReleased(KeyEvent e) { String value = textField.getText(); - ApplicationDataUtil.setProperty(editorModel, CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, value); + JavaBeanObjectUtil.setProperty(editorModel, CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, value); } }); editor = textField; -- 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 c0a931ea11b66e5aee516d43950c904d540a22c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 5 16:14:35 2015 +0100 fixes #6378: [CAPTURE] erreur import fichier trait --- .../tutti/service/operationimport/ImportFromColumnFileModel.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java index 3de3804..954bdfc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java @@ -42,14 +42,12 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; import fr.ifremer.tutti.service.TuttiDataContext; import org.apache.commons.lang3.StringUtils; -import org.nuiton.csv.Common; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ValueSetter; import org.nuiton.util.DateUtil; import java.io.Serializable; import java.util.ArrayList; -import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.List; @@ -88,6 +86,7 @@ public class ImportFromColumnFileModel extends TuttiCsvUtil.AbstractTuttiImportM ValueParser valueParser; switch (field) { case FishingOperation.PROPERTY_FISHING_OPERATION_NUMBER: + case FishingOperation.PROPERTY_TRAWL_DISTANCE: valueParser = TuttiCsvUtil.INTEGER; break; @@ -95,7 +94,6 @@ public class ImportFromColumnFileModel extends TuttiCsvUtil.AbstractTuttiImportM case FishingOperation.PROPERTY_GEAR_SHOOTING_START_LONGITUDE: case FishingOperation.PROPERTY_GEAR_SHOOTING_END_LATITUDE: case FishingOperation.PROPERTY_GEAR_SHOOTING_END_LONGITUDE: - case FishingOperation.PROPERTY_TRAWL_DISTANCE: valueParser = TuttiCsvUtil.FLOAT; break; -- 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 7ab926117776cf7a002ad0011b2bf5ca7119740c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 5 16:15:32 2015 +0100 fixes #5738: [TECH] faire en sorte que les messages d'erreur reste DEVANT afin de pouvoir les consulter --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4919805..cbf62d6 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <eugenePluginVersion>2.13</eugenePluginVersion> - <jaxxVersion>2.20</jaxxVersion> + <jaxxVersion>2.21-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.7</slf4jVersion> <adagioVersion>3.6.4</adagioVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm