This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit a383d34f0a1142d74b97e75f8ad363087d796b45 Author: dcosse <cosse@codelutin.com> Date: Mon Nov 30 16:06:14 2015 +0100 refs #1293 correction de merge --- .../src/main/java/org/chorem/lima/ui/lettering/LetteringView.css | 7 ------- .../java/org/chorem/lima/ui/lettering/LetteringViewHandler.java | 2 -- 2 files changed, 9 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css index 520059d..4cf931b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css @@ -70,18 +70,11 @@ labelFor : {beginPeriodPicker}; } -#beginPeriodPicker { - patternLayout: {handler.DATE_FORMAT}; -} - #endPeriodLabel { text : "lima.lettering.period.end"; labelFor : {endPeriodPicker}; } -#endPeriodPicker { - patternLayout: {handler.DATE_FORMAT}; -} #letteredEntryLabel { actionIcon : "choose-entry"; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java index 67abdc7..66bf038 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java @@ -80,8 +80,6 @@ import static org.nuiton.i18n.I18n.t; */ public class LetteringViewHandler{ - protected static String DATE_FORMAT = t("lima.ui.dateFormat"); - protected LetteringView view; /** Transaction service. */ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.