Author: tchemit Date: 2014-02-04 08:27:32 +0100 (Tue, 04 Feb 2014) New Revision: 2783 Url: http://nuiton.org/projects/jaxx/repository/revisions/2783 Log: fixes #3041: Updates plexus-utils to 3.0.17 refs #3040: updates nuiton-validator to 3.0 refs #3039: updates i18n to 3.0 refs #3038: updates nuiton-utils to 3.0 Modified: trunk/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java trunk/jaxx-demo/LICENSE.txt trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.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/BeanComboBoxDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageWidget.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidgetHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java trunk/src/site/rst/I18n.rst trunk/src/site/rst/old-compiler-doc/I18n.rst Modified: trunk/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java =================================================================== --- trunk/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -44,7 +44,7 @@ import java.util.List; import java.util.UUID; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Useful methods around IO, all method errors are boxes a Modified: trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java =================================================================== --- trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -116,7 +116,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of any ui. Modified: trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java =================================================================== --- trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -40,7 +40,7 @@ import javax.swing.JOptionPane; import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Tutti base action. Modified: trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java =================================================================== --- trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -32,7 +32,7 @@ import javax.swing.AbstractButton; import javax.swing.Action; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Factory of actions. Modified: trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java =================================================================== --- trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -41,7 +41,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit@codelutin.com> Modified: trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java =================================================================== --- trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/tab/CustomTab.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -37,7 +37,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Custom tab component which adds a * in the end of the title @@ -105,7 +105,7 @@ protected void updateTitle() { Font f = UIManager.getDefaults().getFont("Label.font"); - String titleValue = _(model.getTitle()); + String titleValue = t(model.getTitle()); int style; if (model.isModify()) { Modified: trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java =================================================================== --- trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -33,7 +33,7 @@ import javax.swing.JOptionPane; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Helper to display errors. Modified: trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java =================================================================== --- trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -40,7 +40,7 @@ import java.net.URISyntaxException; import java.net.URL; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Useful ui methods. Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -34,7 +34,7 @@ import java.util.List; /** - * I18n methods to add {@link I18n#_(String, Object...)} method on some attributes. + * I18n methods to add {@link I18n#t(String, Object...)} method on some attributes. * <p/> * Make sure to set an i18nable compiler to have his {@link CompilerConfiguration#isI18nable()} returning true. * @@ -87,11 +87,11 @@ if (log.isDebugEnabled()) { log.debug(" try i18n support for [" + widgetId + ":" + attributeName + "] : " + attributeValueCode); } - if (attributeValueCode.contains("_(") && attributeValueCode.contains(")")) { - compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n._ for attribute '" + attributeName + "' in component '" + widgetId + "' : [" + attributeValueCode + "]"); + if (attributeValueCode.contains("t(") && attributeValueCode.contains(")") && !attributeValueCode.contains(",")) { + compiler.reportWarning("\n\tjaxx supports i18n, no need to add explicit call to I18n.t for attribute '" + attributeName + "' in component '" + widgetId + "' : [" + attributeValueCode + "]"); } else { - compiler.addImport("static " + I18n.class.getName() + "._"); - attributeValueCode = "_(" + attributeValueCode + ")"; + compiler.addImport("static " + I18n.class.getName() + ".t"); + attributeValueCode = "t(" + attributeValueCode + ")"; } return attributeValueCode; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -437,7 +437,7 @@ "javax.swing.event.*", "jaxx.runtime.*", "jaxx.runtime.swing.*", - "static org.nuiton.i18n.I18n._", + "static org.nuiton.i18n.I18n.t", "static jaxx.runtime.SwingUtil.createImageIcon" ) */ Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -42,7 +42,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * callBackUI handler Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -39,8 +39,8 @@ import java.awt.Color; import java.awt.Font; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Handler of {@link ConfigCategoryUI}. Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -35,7 +35,7 @@ import java.awt.Component; import java.awt.Font; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Pour le rendu du tableau des options d'une categorie Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -56,7 +56,7 @@ import java.awt.event.WindowEvent; import java.util.ArrayList; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of the {@link ConfigUI} ui. Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -45,7 +45,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Le modele de l'ui des preferences. Modified: trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java =================================================================== --- trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -37,7 +37,7 @@ import java.util.Date; import java.util.Locale; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A config to test config ui api when using a delegation Modified: trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java =================================================================== --- trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -35,7 +35,7 @@ import java.util.Date; import java.util.Locale; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A config to test config ui api when using a delegation Modified: trunk/jaxx-demo/LICENSE.txt =================================================================== --- trunk/jaxx-demo/LICENSE.txt 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/LICENSE.txt 2014-02-04 07:27:32 UTC (rev 2783) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -38,7 +38,7 @@ import java.net.URI; import java.util.Properties; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 1/9/14. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -48,7 +48,7 @@ import java.util.Locale; import java.util.Properties; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * La configuration de l'application. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -64,8 +64,8 @@ import java.util.Arrays; import java.util.Locale; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Le handler de l'ui principale. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -41,7 +41,7 @@ import java.util.Arrays; import java.util.Date; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** @author tchemit <chemit@codelutin.com> */ public class RunDemo { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -32,8 +32,8 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Handlerof {@link BeanComboBoxDemo}. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -32,8 +32,8 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Handlerof {@link BeanComboBoxDemo}. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -33,7 +33,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 11/26/13. Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx 2014-02-04 07:27:32 UTC (rev 2783) @@ -26,7 +26,7 @@ <import> jaxx.runtime.swing.editor.SimpleTimeEditor - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <!-- model --> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx 2014-02-04 07:27:32 UTC (rev 2783) @@ -26,7 +26,7 @@ <import> jaxx.demo.entities.People - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <People id='data' javaBean='null'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx 2014-02-04 07:27:32 UTC (rev 2783) @@ -26,7 +26,7 @@ <import> jaxx.demo.entities.Movie - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <Movie id='data' javaBean='null'/> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -30,7 +30,7 @@ import jaxx.runtime.swing.nav.NavNode; import jaxx.runtime.swing.nav.treetable.NavTreeTableModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author sletellier <letellier@codelutin.com> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -33,7 +33,7 @@ import javax.swing.tree.DefaultTreeModel; import java.awt.Component; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author sletellier <letellier@codelutin.com> Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -179,7 +179,7 @@ protected boolean testPhase; /** - * To make compiler i18nable, says add the {@link I18n#_(String, Object...)} + * To make compiler i18nable, says add the {@link I18n#t(String, Object...)} * method invocation on {@link I18nHelper#I18N_ATTRIBUTES} attributes. * * @see I18nHelper Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; public class NodeItem { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -105,7 +105,7 @@ import java.util.NoSuchElementException; import java.util.Properties; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * The runtime swing util class with some nice stuff. Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Le renderer abstrait (qui a toutes les methodes qui aident) pour implanter de Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -30,7 +30,7 @@ import javax.swing.table.TableColumn; import java.awt.Component; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A simple TableCellRenderer using a delegate TableCellRenderer to render Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -34,7 +34,7 @@ import java.lang.reflect.Array; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Classe de méthodes utiles sur les wizard. Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -33,7 +33,7 @@ import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A simple render of a table of validator's messages, says a table that use Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -31,7 +31,7 @@ import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * TODO Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -32,7 +32,7 @@ import javax.swing.JList; import java.awt.Component; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A simple render of a table of validator's messages, says a table that use a Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -32,7 +32,7 @@ import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A simple render of a table of validator's messages, says a table that use Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageWidget.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageWidget.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageWidget.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -60,8 +60,8 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Button which opens a popup containing a table with the errors found @@ -90,7 +90,7 @@ public SwingValidatorMessageWidget() { super(SwingUtil.createActionIcon("alert-none")); - setToolTipText(_("validator.messageWidget.alert.none")); + setToolTipText(t("validator.messageWidget.alert.none")); errorTableModel.addTableModelListener(new TableModelListener() { @@ -99,13 +99,13 @@ String label; switch (alerts) { case 0: - label = n_("validator.messageWidget.alert.none"); + label = n("validator.messageWidget.alert.none"); break; case 1: - label = n_("validator.messageWidget.alert.one"); + label = n("validator.messageWidget.alert.one"); break; default: - label = n_("validator.messageWidget.alert.several"); + label = n("validator.messageWidget.alert.several"); } NuitonValidatorScope maxScope; @@ -135,7 +135,7 @@ } } - setToolTipText(_(label, alerts)); + setToolTipText(t(label, alerts)); setIcon(SwingUtil.createActionIcon(icon)); } }); @@ -154,9 +154,9 @@ JScrollPane scrollPanel = new JScrollPane(errorTable); scrollPanel.setColumnHeaderView(errorTable.getTableHeader()); - JXTitledPanel titledPanel = new JXTitledPanel(_("validator.messageWidget.title"), scrollPanel); + JXTitledPanel titledPanel = new JXTitledPanel(t("validator.messageWidget.title"), scrollPanel); popup.add(titledPanel); - popup.setTitle(_("validator.messageWidget.title")); + popup.setTitle(t("validator.messageWidget.title")); popup.setSize(800, 300); popup.setAlwaysOnTop(true); popup.setUndecorated(true); @@ -235,7 +235,7 @@ closeAction.putValue(Action.LARGE_ICON_KEY, actionIcon); closeAction.putValue(Action.ACTION_COMMAND_KEY, "close"); closeAction.putValue(Action.NAME, "close"); - closeAction.putValue(Action.SHORT_DESCRIPTION, _("validator.messageWidget.closeDialog.tip")); + closeAction.putValue(Action.SHORT_DESCRIPTION, t("validator.messageWidget.closeDialog.tip")); rootPane.getActionMap().put(CLOSE_DIALOG_ACTION, closeAction); Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -525,7 +525,7 @@ if (editor != null) { text = (String) editor.getClientProperty("validatorLabel"); /*if (l != null) { - text = I18n._(l); + text = I18n.t(l); } else { // TODO should try the text }*/ @@ -542,7 +542,7 @@ if (editor != null) { text = (String) editor.getClientProperty("validatorLabel"); /*if (l != null) { - text = I18n._(l); + text = I18n.t(l); } else { // TODO should try the text }*/ Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -48,7 +48,7 @@ import java.io.IOException; import java.io.InputStream; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of the ui {@link AboutPanel}. Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidgetHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidgetHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/MemoryStatusWidgetHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -32,7 +32,7 @@ import java.awt.font.LineMetrics; import java.awt.geom.Rectangle2D; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of ui {@link MemoryStatusWidget}. @@ -67,7 +67,7 @@ g.fillRect(insets.left, insets.top, (int) ((float) width * fraction), height); // No i18n string was : // String str = usedMemory / 1024 + "/" + totalMemory / 1024 + "Mb"; - String str = _("memorywidget.memory", usedMemory / 1024, totalMemory / 1024); + String str = t("memorywidget.memory", usedMemory / 1024, totalMemory / 1024); //FontRenderContext frc = new FontRenderContext(null, false, false); Rectangle2D bounds = g.getFont().getStringBounds(str, frc); Graphics g2 = g.create(); Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -45,8 +45,8 @@ import java.util.Collection; import java.util.Locale; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Handler of ui {@link I18nEditor}. Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -69,8 +69,8 @@ import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Class with usefull methods used in bean uis. Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -30,7 +30,7 @@ import java.util.regex.Matcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 11/25/13. Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java 2014-02-04 07:27:32 UTC (rev 2783) @@ -30,7 +30,7 @@ import java.util.regex.Matcher; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 11/25/13. Modified: trunk/src/site/rst/I18n.rst =================================================================== --- trunk/src/site/rst/I18n.rst 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/src/site/rst/I18n.rst 2014-02-04 07:27:32 UTC (rev 2783) @@ -56,7 +56,7 @@ rencontre certains attributs on encapsule la valeur de l'attribution par un appel à la méthode :: - org.nuiton.i18n.I18n._(String) + org.nuiton.i18n.I18n.t(String) La liste des attributs en question sont les suivants : Modified: trunk/src/site/rst/old-compiler-doc/I18n.rst =================================================================== --- trunk/src/site/rst/old-compiler-doc/I18n.rst 2014-02-04 07:12:14 UTC (rev 2782) +++ trunk/src/site/rst/old-compiler-doc/I18n.rst 2014-02-04 07:27:32 UTC (rev 2783) @@ -53,7 +53,7 @@ :: - org.nuiton.i18n.I18n._(String) + org.nuiton.i18n.I18n.t(String) La liste des attributs en question sont les suivants :