Author: tchemit Date: 2010-03-07 19:09:19 +0100 (Sun, 07 Mar 2010) New Revision: 1761 Log: fix build (new i18n api) + fix deprecated stuff Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java 2010-03-07 17:32:52 UTC (rev 1760) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoSourcesHandler.java 2010-03-07 18:09:19 UTC (rev 1761) @@ -87,7 +87,8 @@ } List<String> toFill = new ArrayList<String>(); - String prefix = ui.getIncomingClass() == null ? "" : (ui.getIncomingClass().getPackage().getName() + "."); + String prefix = ui.getIncomingClass() == null ? "" : + ui.getIncomingClass().getPackage().getName() + "."; for (String source : sources) { String path = prefix + source; if (log.isDebugEnabled()) { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java 2010-03-07 17:32:52 UTC (rev 1760) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoTreeHelper.java 2010-03-07 18:09:19 UTC (rev 1761) @@ -136,7 +136,7 @@ builder.printModel(model.getRoot()); } // save tree model in context - setTreeModel(context, model); + setModel(context, model); return model; } @@ -154,7 +154,7 @@ @Override protected NavigationTreeModel getNavigationTreeModel() { - return getTreeModel(getContext()); + return (NavigationTreeModel) getModel(getContext()); } @Override Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2010-03-07 17:32:52 UTC (rev 1760) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2010-03-07 18:09:19 UTC (rev 1761) @@ -74,7 +74,7 @@ } DecoratorProvider decoratorProvider = rootContext.getContextValue(DecoratorProvider.class); - if (!config.getLocale().equals(I18n.getLoader().getLanguage().getLocale())) { + if (!config.getLocale().equals(I18n.getStore().getLanguage().getLocale())) { if (log.isInfoEnabled()) { log.info("re-init I18n with locale " + config.getLocale()); } @@ -120,7 +120,7 @@ public void displayUI(final DemoUI ui, final String nodePath) { // expend all nodes of the demo tree - jaxx.runtime.SwingUtil.expandTree(ui.getNavigation()); + SwingUtil.expandTree(ui.getNavigation()); SwingUtilities.invokeLater(new Runnable() { @@ -209,7 +209,7 @@ * @param context l'ui principale de l'application * @param fullscreen le nouvel état requis. */ - public void changeScreen(JAXXContext context, final boolean fullscreen) { + public void changeScreen(JAXXContext context, boolean fullscreen) { DemoUI ui = getUI(context); @@ -277,7 +277,7 @@ public void showConfig(JAXXContext context) { DemoUI ui = getUI(context); - final DemoConfig config = ui.getConfig(); + DemoConfig config = ui.getConfig(); ConfigUIModelBuilder builder = new ConfigUIModelBuilder(); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2010-03-07 17:32:52 UTC (rev 1760) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2010-03-07 18:09:19 UTC (rev 1761) @@ -30,8 +30,13 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import static org.nuiton.i18n.I18n._; + +import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.util.StringUtil; +import java.util.Arrays; +import java.util.Date; + /** * @author chemit */ @@ -49,7 +54,7 @@ public static void main(String[] args) { long startingTime = System.nanoTime(); - log.info("JAXX Demo start at " + new java.util.Date() + " args: " + java.util.Arrays.toString(args)); + log.info("JAXX Demo start at " + new Date() + " args: " + Arrays.toString(args)); try { @@ -61,7 +66,7 @@ long t0 = System.nanoTime(); - I18n.setUniqueBundleName("jaxx-demo-i18n"); + I18n.setInitializer(new DefaultI18nInitializer("jaxx-demo-i18n")); Runtime.getRuntime().addShutdownHook(new ShutdownHook()); @@ -100,7 +105,7 @@ log.info("language : " + config.getLocale()); if (log.isDebugEnabled()) { - log.debug("i18n loading time : " + (StringUtil.convertTime(t00, System.nanoTime()))); + log.debug("i18n loading time : " + StringUtil.convertTime(t00, System.nanoTime())); } log.info(_("jaxxdemo.message.config.loaded", config.getVersion())); @@ -118,7 +123,7 @@ } if (log.isDebugEnabled()) { - log.debug("init done in " + (StringUtil.convertTime(t0, System.nanoTime()))); + log.debug("init done in " + StringUtil.convertTime(t0, System.nanoTime())); } log.info(_("jaxxdemo.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); @@ -191,7 +196,7 @@ // force to kill main thread - log.info(_("jaxxdemo.init.closed", new java.util.Date())); + log.info(_("jaxxdemo.init.closed", new Date())); Runtime.getRuntime().halt(0); } catch (Exception ex) { log.error("error while closing " + ex.getMessage(), ex); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx 2010-03-07 17:32:52 UTC (rev 1760) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx 2010-03-07 18:09:19 UTC (rev 1761) @@ -73,7 +73,7 @@ showPopupText='{showPopupText.isSelected()}' showPopupIcon='{showPopupIcon.isSelected()}' popupBorder='{getPopupBorder(popupBorderText.getText())}' - locales='{Arrays.asList(I18n.getLoader().getLocales())}'/> + locales='{Arrays.asList(I18n.getStore().getLocales())}'/> </cell> </row> <row>