Author: echatellier Date: 2011-05-02 11:24:59 +0200 (Mon, 02 May 2011) New Revision: 3089 Url: http://chorem.org/repositories/revision/lima/3089 Log: Fix compilation error due to updated libs Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2011-05-02 09:18:45 UTC (rev 3088) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2011-05-02 09:24:59 UTC (rev 3089) @@ -133,7 +133,7 @@ } @Override - public void parse(String[] args) throws ArgumentsParserException { + public ApplicationConfig parse(String... args) throws ArgumentsParserException { // super parse, read config file etc... super.parse(args); @@ -143,6 +143,8 @@ String sVersion = VersionUtil.removeSnapshot(getOption("application.version")); version = VersionUtil.valueOf(sVersion); + return this; + } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java 2011-05-02 09:18:45 UTC (rev 3088) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java 2011-05-02 09:24:59 UTC (rev 3089) @@ -32,6 +32,7 @@ import org.chorem.lima.ui.MainView; import org.chorem.lima.ui.MainViewHandler; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import java.util.Locale; @@ -102,7 +103,7 @@ public void initI18n() { Locale locale = getConfig().getLocale(); - I18n.init(locale); + I18n.init(new ClassPathI18nInitializer(), locale); // Default Locale for DatePicker Locale.setDefault(locale); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2011-05-02 09:18:45 UTC (rev 3088) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2011-05-02 09:24:59 UTC (rev 3089) @@ -119,15 +119,16 @@ System.setSecurityManager(null); // init i18n - long t0 = System.nanoTime(); + //long t0 = System.nanoTime(); // FIXME cause NPE // I18n.setInitializer(new DefaultI18nInitializer("lima-swing-i18n")); - I18n.init(Locale.FRANCE); - if (log.isDebugEnabled()) { - log.debug("i18n loading time : " + (StringUtil.convertTime(t0, System.nanoTime()))); - } + // FIXME echatellier 20110502 duplicated code with context.initI18n(); + //I18n.init(Locale.FRANCE); + //if (log.isDebugEnabled()) { + // log.debug("i18n loading time : " + (StringUtil.convertTime(t0, System.nanoTime()))); + //} Runtime.getRuntime().addShutdownHook(new ShutdownHook());