This is an automated email from the git hooks/post-receive script. New commit to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6607ccdc4b4b3495418136a7e828759244301b3a Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 21 10:28:40 2016 +0200 modif de la conif de port série : nombre au lieu de faire une liste des ports dispo (refs #7459) --- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 5 ++--- .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 5 ++--- .../src/main/java/fr/ifremer/tutti/util/SerialPort.java | 12 ------------ .../main/resources/i18n/tutti-persistence_en_GB.properties | 1 + 4 files changed, 5 insertions(+), 18 deletions(-) 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 613b18c..ab5397e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -29,7 +29,6 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.BeepFrequency; -import fr.ifremer.tutti.util.SerialPort; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; @@ -733,8 +732,8 @@ public class TuttiConfiguration extends ApplicationConfiguration { return applicationConfig.getOptionAsInt(TuttiConfigurationOption.ICHTYOMETER_MAXIMUM_NUMBER_OF_ATTEMPT_TO_CONNECT.getKey()); } - public SerialPort getCaliperSerialPort() { - return SerialPort.valueOf(applicationConfig.getOption(TuttiConfigurationOption.CALIPER_SERIAL_PORT.getKey())); + public int getCaliperSerialPort() { + return applicationConfig.getOptionAsInt(TuttiConfigurationOption.CALIPER_SERIAL_PORT.getKey()); } public Boolean isExternalDevicesVoiceEnabled() { 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 97c0413..2177eb6 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -26,7 +26,6 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.util.BeepFrequency; -import fr.ifremer.tutti.util.SerialPort; import org.hibernate.dialect.HSQLDialect; import org.hsqldb.jdbcDriver; import org.nuiton.config.ConfigOptionDef; @@ -650,8 +649,8 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { CALIPER_SERIAL_PORT( "tutti.ichtyometer.caliperSerialPort", n("tutti.config.option.caliper.serialPort.description"), - "COM1", - SerialPort.class, + "1", + int.class, false ), EXTERNAL_DEVICES_VOICE_ENABLED( diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/SerialPort.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/SerialPort.java deleted file mode 100644 index 6cd4ba7..0000000 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/SerialPort.java +++ /dev/null @@ -1,12 +0,0 @@ -package fr.ifremer.tutti.util; - -/** - * @author Kevin Morin (Code Lutin) - * @since 4.5 - */ -public enum SerialPort { - - COM1, - COM2, - COM3 -} diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties index e9fd0bc..7dd397c 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties @@ -10,6 +10,7 @@ tutti.caracteristicType.vesselUseFeature= tutti.config= tutti.config.option.basedir.description= tutti.config.option.beepFrequency.description= +tutti.config.option.caliper.serialPort.description= tutti.config.option.cruiseId.description= tutti.config.option.csv.separator.description= tutti.config.option.data.directory.description= -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.