Author: kmorin Date: 2013-01-28 11:13:27 +0100 (Mon, 28 Jan 2013) New Revision: 246 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/246 Log: closes #1854 [ERGO] - Format d'affichage (coordonn?\195?\169es, dates) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-01-28 09:08:49 UTC (rev 245) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-01-28 10:13:27 UTC (rev 246) @@ -369,6 +369,8 @@ if (log.isDebugEnabled()) { log.debug("disable JXDatePicker editor" + picker.getName()); } + String dateFormat = getConfig().getDateFormat(); + picker.setFormats(dateFormat); picker.getEditor().setEditable(false); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-28 09:08:49 UTC (rev 245) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-28 10:13:27 UTC (rev 246) @@ -28,6 +28,11 @@ import fr.ifremer.tutti.service.TuttiServiceTechnicalException; import fr.ifremer.tutti.service.config.TuttiServiceConfig; import fr.ifremer.tutti.ui.swing.util.editor.CoordinateEditorType; +import java.awt.Color; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import javax.swing.KeyStroke; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; @@ -37,12 +42,6 @@ import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.Version; -import javax.swing.KeyStroke; -import java.awt.Color; -import java.io.File; -import java.io.IOException; -import java.net.URL; - /** * Tutti application config. * @@ -168,6 +167,10 @@ return result; } + public String getDateFormat() { + return applicationConfig.getOption(TuttiConfigOption.DATE_FORMAT.getKey()); + } + public Version getVersion() { return serviceConfig.getVersion(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java 2013-01-28 09:08:49 UTC (rev 245) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigOption.java 2013-01-28 10:13:27 UTC (rev 246) @@ -89,23 +89,34 @@ new Color(192, 192, 192).toString(), Color.class ), + COLOR_ROW_INVALID( "tutti.ui.color.rowInvalid", n_("tutti.config.ui.color.rowInvalid"), new Color(255, 128, 128).toString(), - Color.class), + Color.class + ), SHORTCUT_CLOSE_POPUP( "tutti.ui.shortcut.closePopup", n_("tutti.config.ui.shortcut.closePopup"), "alt pressed F", - KeyStroke.class), + KeyStroke.class + ), COORDINATE_EDITOR_TYPE( "tutti.ui.coordinateEditorType", n_("tutti.config.ui.coordinateEditorType"), CoordinateEditorType.DD.toString(), - CoordinateEditorType.class); + CoordinateEditorType.class + ), + + DATE_FORMAT( + "tutti.ui.dateFormat", + n_("tutti.config.ui.dateFormat"), + "dd/MM/yyyy", + String.class + ); /** Configuration key. */ private final String key; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-01-28 09:08:49 UTC (rev 245) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-01-28 10:13:27 UTC (rev 246) @@ -108,6 +108,7 @@ CALLBACK_UI) .addOption(TuttiConfigOption.COLOR_ROW_INVALID) .addOption(TuttiConfigOption.COLOR_ROW_READ_ONLY) + .addOption(TuttiConfigOption.DATE_FORMAT) .addOption(TuttiConfigOption.COORDINATE_EDITOR_TYPE); // SHORTCUT Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-01-28 09:08:49 UTC (rev 245) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-01-28 10:13:27 UTC (rev 246) @@ -100,7 +100,6 @@ #beginDateField { date: {model.getBeginDate()}; - formats: {"dd/MM/yyyy"}; } #endDateLabel { @@ -110,7 +109,6 @@ #endDateField { date: {model.getEndDate()}; - formats: {"dd/MM/yyyy"}; } #trawlNetLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-28 09:08:49 UTC (rev 245) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-01-28 10:13:27 UTC (rev 246) @@ -73,16 +73,6 @@ numberPattern: {INT_6_DIGITS_PATTERN}; } -#dateLabel { - text: "tutti.label.fishingOperation.date"; - labelFor: {dateField}; -} - -#dateField { - date: {model.getDate()}; - formats: {"dd/MM/yyyy"}; -} - #strataLabel { text: "tutti.label.fishingOperation.strata"; labelFor: {strataComboBox}; @@ -285,7 +275,6 @@ #gearShootingStartDateField { date: {model.getGearShootingStartDate()}; - formats: {"dd/MM/yyyy"}; } #gearShootingStartTimeField { @@ -373,7 +362,6 @@ #gearShootingEndDateField { date: {model.getGearShootingEndDate()}; - formats: {"dd/MM/yyyy"}; } #gearShootingEndTimeField { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-28 09:08:49 UTC (rev 245) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-28 10:13:27 UTC (rev 246) @@ -93,6 +93,7 @@ tutti.config.ui.color.rowReadOnly=Cellule non éditable tutti.config.ui.config=Chemin du fichier de configuration des interfaces graphiques tutti.config.ui.coordinateEditorType= +tutti.config.ui.dateFormat=Format de dates tutti.config.ui.shortcut.closePopup=Fermer une popup tutti.config.ui.showNumberEditorButton=Afficher le pavé numérique de saisie tutti.config.ui.useSexagecimalEditor=Utiliser l'éditeur sexagécimal pour entrer des coordonnées