This is an automated email from the git hooks/post-receive script. New commit to branch feature/8192 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit bfbdf45e088e4da4af34ce513afa5eb1436e431a Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 25 12:30:28 2016 +0100 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) --- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ---- .../src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 8 -------- .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 3 --- 3 files changed, 15 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 2b153a8..45bea6e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -681,10 +681,6 @@ public class TuttiConfiguration extends ApplicationConfiguration { return applicationConfig.getOption(TuttiConfigurationOption.SAMPLING_CODE_PREFIX.getKey()); } - public String getSamplingCodeSeparator() { - return applicationConfig.getOption(TuttiConfigurationOption.SAMPLING_CODE_SEPARATOR.getKey()); - } - public KeyStroke getShortCut(String actionName) { return applicationConfig.getOptionAsKeyStroke( "tutti.ui." + actionName); 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 fc64d5d..e989798 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -632,14 +632,6 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { false ), - SAMPLING_CODE_SEPARATOR( - "tutti.ui.max.sampligCodeSeparator", - n("tutti.config.option.ui.sampligCodeSeparator.description"), - "#", - String.class, - false - ), - FULL_BLUETOOTH_SCAN( "tutti.ichtyometer.fullBluetoothScan", n("tutti.config.option.ichtyometer.fullBluetoothScan.description"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index 859cb40..d60cb57 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -122,9 +122,6 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.SAMPLING_CODE_PREFIX) .setOptionShortLabel(t("tutti.config.option.ui.samplingCodePrefix.shortLabel")) - .addOption(TuttiConfigurationOption.SAMPLING_CODE_SEPARATOR) - .setOptionShortLabel(t("tutti.config.option.ui.samplingCodeSeparator.shortLabel")) - .addOption(TuttiConfigurationOption.SHOW_BATCH_LOG) .setOptionShortLabel(t("tutti.config.option.ui.showBatchLog.shortLabel")) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.