Author: tchemit Date: 2014-02-04 08:12:14 +0100 (Tue, 04 Feb 2014) New Revision: 2782 Url: http://nuiton.org/projects/jaxx/repository/revisions/2782 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/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/java/JavaElement.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTabbedPaneHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.css 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/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/BeanComboBoxDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1751Test.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/I18nTest.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.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/session/SwingSession.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/SwingValidatorUtil.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css 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/pom.xml 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-application-api/src/main/java/org/nuiton/jaxx/application/ApplicationIOUtil.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -82,7 +82,7 @@ try { ZipUtil.compressFiles(archiveFile, source, files); } catch (IOException e) { - throw new ApplicationTechnicalException(_(errorMessage, archiveFile), e); + throw new ApplicationTechnicalException(t(errorMessage, archiveFile), e); } } @@ -210,7 +210,7 @@ return Files.newReader(file, Charsets.UTF_8); } catch (FileNotFoundException e) { - throw new ApplicationTechnicalException(_(errorMessage, file), e); + throw new ApplicationTechnicalException(t(errorMessage, file), e); } } @@ -220,7 +220,7 @@ return Files.newWriter(file, Charsets.UTF_8); } catch (FileNotFoundException e) { - throw new ApplicationTechnicalException(_(errorMessage, file), e); + throw new ApplicationTechnicalException(t(errorMessage, file), e); } } @@ -231,7 +231,7 @@ try { ZipUtil.uncompress(file, tempDir); } catch (IOException e) { - throw new ApplicationTechnicalException(_(errorMessage, file), e); + throw new ApplicationTechnicalException(t(errorMessage, file), e); } return tempDir; } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/AbstractApplicationUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -301,11 +301,11 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, message, - _("jaxx.application.common.askSaveBeforeLeaving.help")); + t("jaxx.application.common.askSaveBeforeLeaving.help")); int result = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("jaxx.application.common.askSaveBeforeLeaving.title"), + t("jaxx.application.common.askSaveBeforeLeaving.title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); return result; @@ -315,11 +315,11 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, message, - _("jaxx.application.common.askCancelEditBeforeLeaving.help")); + t("jaxx.application.common.askCancelEditBeforeLeaving.help")); int i = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("jaxx.application.common.askCancelEditBeforeLeaving.title"), + t("jaxx.application.common.askCancelEditBeforeLeaving.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -718,7 +718,7 @@ } String dateFormat = getContext().getDateFormat(); picker.setFormats(dateFormat); - picker.setToolTipText(_("jaxx.application.common.datefield.tip", dateFormat)); + picker.setToolTipText(t("jaxx.application.common.datefield.tip", dateFormat)); picker.getEditor().addFocusListener(new FocusAdapter() { @Override @@ -880,10 +880,10 @@ TableColumnExt col = new TableColumnExt(model.getColumnCount()); col.setCellEditor(editor); col.setCellRenderer(renderer); - String label = _(identifier.getHeaderI18nKey()); + String label = t(identifier.getHeaderI18nKey()); col.setHeaderValue(label); - String tip = _(identifier.getHeaderTipI18nKey()); + String tip = t(identifier.getHeaderTipI18nKey()); col.setToolTipText(tip); 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/AbstractApplicationAction.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -254,13 +254,13 @@ // file exists ask user to overwrite String htmlMessage = String.format( AbstractApplicationUIHandler.CONFIRMATION_FORMAT, - _("jaxx.application.common.askOverwriteFile.message", file), - _("jaxx.application.common.askOverwriteFile.help")); + t("jaxx.application.common.askOverwriteFile.message", file), + t("jaxx.application.common.askOverwriteFile.help")); result = JOptionPane.showConfirmDialog( getHandler().getTopestUI(), htmlMessage, - _("jaxx.application.common.askOverwriteFile.title"), + t("jaxx.application.common.askOverwriteFile.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION; } else { @@ -275,7 +275,7 @@ String htmlMessage = String.format( AbstractApplicationUIHandler.CONFIRMATION_FORMAT, message, - _("jaxx.application.common.askBeforeDelete.help")); + t("jaxx.application.common.askBeforeDelete.help")); int i = JOptionPane.showConfirmDialog( getHandler().getTopestUI(), htmlMessage, 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionFactory.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -62,7 +62,7 @@ ApplicationUIAction<A> result = createUIAction(abstractButton, logicAction); return result; } catch (Exception e) { - throw new ApplicationTechnicalException(_("jaxx.application.action.create.error", actionName), e); + throw new ApplicationTechnicalException(t("jaxx.application.action.create.error", actionName), e); } } @@ -86,7 +86,7 @@ A result = ConstructorUtils.invokeConstructor(actionName, handler); return result; } catch (Exception e) { - throw new ApplicationTechnicalException(_("jaxx.application.action.create.error", actionName), e); + throw new ApplicationTechnicalException(t("jaxx.application.action.create.error", actionName), e); } } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/action/ApplicationActionUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -223,12 +223,12 @@ } protected void showAction(AbstractApplicationAction action) { - ui.setTitle(_("jaxx.application.title.actionUI", + ui.setTitle(t("jaxx.application.title.actionUI", getContext().getConfiguration().getApplicationName(), getContext().getConfiguration().getVersion(), action.getActionDescription())); ui.getGlobalActionLabel().setText( - _("jaxx.application.message.action.running", + t("jaxx.application.message.action.running", action.getActionDescription())); ui.pack(); 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationErrorHelper.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -59,21 +59,21 @@ if (cause == null) { JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + message + "</body></html>", - _("jaxx.application.error.ui.business.error"), + t("jaxx.application.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else if (cause instanceof ApplicationBusinessException) { JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + cause.getMessage() + "</body></html>", - _("jaxx.application.error.ui.business.error"), + t("jaxx.application.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else if (cause instanceof ImportRuntimeException) { JOptionPane.showMessageDialog(context.getMainUI(), cause.getMessage(), - _("jaxx.application.error.ui.business.error"), + t("jaxx.application.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else { JXErrorPane pane = new JXErrorPane(); - ErrorInfo info = new ErrorInfo(_("jaxx.application.error.ui.other.error"), - _("jaxx.application.error.errorpane.htmlmessage", message), null, null, + ErrorInfo info = new ErrorInfo(t("jaxx.application.error.ui.other.error"), + t("jaxx.application.error.errorpane.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); pane.setErrorReporter(this); @@ -105,7 +105,7 @@ public void showWarningDialog(String message) { JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + message + "</body></html>", - _("jaxx.application.error.ui.business.warning"), + t("jaxx.application.error.ui.business.warning"), JOptionPane.WARNING_MESSAGE); } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-application-swing/src/main/java/org/nuiton/jaxx/application/swing/util/ApplicationUIUtil.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -79,7 +79,7 @@ try { openLink(url.toURI()); } catch (URISyntaxException e) { - throw new ApplicationTechnicalException(_("jaxx.application.error.cannot.open.link", url), e); + throw new ApplicationTechnicalException(t("jaxx.application.error.cannot.open.link", url), e); } } @@ -87,7 +87,7 @@ if (!Desktop.isDesktopSupported()) { throw new ApplicationTechnicalException( - _("jaxx.application.error.desktop.not.supported")); + t("jaxx.application.error.desktop.not.supported")); } Desktop desktop = Desktop.getDesktop(); @@ -95,7 +95,7 @@ if (!desktop.isSupported(Desktop.Action.BROWSE)) { throw new ApplicationTechnicalException( - _("jaxx.application.error.desktop.browse.not.supported")); + t("jaxx.application.error.desktop.browse.not.supported")); } return desktop; @@ -111,7 +111,7 @@ } catch (Exception e) { throw new ApplicationTechnicalException( - _("jaxx.application.error.cannot.open.link", uri), e); + t("jaxx.application.error.cannot.open.link", uri), e); } } @@ -119,7 +119,7 @@ if (!Desktop.isDesktopSupported()) { throw new ApplicationTechnicalException( - _("jaxx.application.error.desktop.not.supported")); + t("jaxx.application.error.desktop.not.supported")); } Desktop desktop = Desktop.getDesktop(); @@ -127,7 +127,7 @@ if (!desktop.isSupported(Desktop.Action.MAIL)) { throw new ApplicationTechnicalException( - _("jaxx.application.error.desktop.mail.not.supported")); + t("jaxx.application.error.desktop.mail.not.supported")); } return desktop; @@ -144,7 +144,7 @@ } catch (Exception e) { throw new ApplicationTechnicalException( - _("jaxx.application.error.cannot.mail"), e); + t("jaxx.application.error.cannot.mail"), e); } } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaElement.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -25,7 +25,7 @@ package jaxx.compiler.java; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.lang.reflect.Modifier; import java.util.Comparator; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFile.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -27,7 +27,7 @@ import jaxx.compiler.finalizers.JAXXCompilerFinalizer; import jaxx.compiler.types.TypeManager; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaFileGenerator.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -27,7 +27,7 @@ import jaxx.compiler.JAXXCompiler; import jaxx.compiler.java.JavaMethod.MethodOrder; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTabbedPaneHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTabbedPaneHandler.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JTabbedPaneHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -89,7 +89,7 @@ String title = tabInfo.getTitle(); if (title != null) { if (I18nHelper.isI18nAttribute(ATTRIBUTE_TITLE)) { - if (!title.startsWith("_(\"")) { + if (!title.startsWith("t(\"")) { // we did not have the invocation code, add it title = I18nHelper.addI18nInvocation(getId(), ATTRIBUTE_TITLE, TypeManager.getJavaCode(title), compiler); } @@ -102,7 +102,7 @@ String toolTipText = tabInfo.getToolTipText(); if (toolTipText != null) { if (I18nHelper.isI18nAttribute(ATTRIBUTE_TOOL_TIP_TEXT)) { - if (!toolTipText.startsWith("_(\"")) { + if (!toolTipText.startsWith("t(\"")) { // we did not have the invocation code, add it toolTipText = I18nHelper.addI18nInvocation(getId(), ATTRIBUTE_TOOL_TIP_TEXT, TypeManager.getJavaCode(toolTipText), compiler); } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/swing/JXLayerHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -30,7 +30,7 @@ import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.ClassDescriptorHelper; import jaxx.compiler.tags.DefaultComponentHandler; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.jdesktop.jxlayer.JXLayer; import java.awt.Component; 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCallBackUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -131,14 +131,14 @@ if (log.isDebugEnabled()) { log.debug("callBackEntry detected " + v.getName()); } - value = _(v.getDescription()); + value = t(v.getDescription()); } else if (value instanceof OptionModel) { OptionModel v = (OptionModel) value; if (log.isDebugEnabled()) { log.debug("option detected " + v.getKey()); } - value = v.getKey() + " (" + _(v.getDescription()) + ")"; + value = v.getKey() + " (" + t(v.getDescription()) + ")"; } JLabel rendererComponent; @@ -183,7 +183,7 @@ ConfigUIHandler.CALLBACKS); for (CallBackEntry e : callBacks) { if (log.isInfoEnabled()) { - log.info("launch callBack " + _(e.getDescription())); + log.info("launch callBack " + t(e.getDescription())); } e.getAction().run(); } Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.css =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUI.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -29,7 +29,7 @@ } #descriptionPane { - columnHeaderView:{new JLabel(_("config.description"), SwingUtil.getUIManagerActionIcon("information"), 10)}; + columnHeaderView:{new JLabel(t("config.description"), SwingUtil.getUIManagerActionIcon("information"), 10)}; } #description { @@ -37,7 +37,7 @@ editable:false; focusable:false; font-size:10; - text:{_("config.no.option.selected")}; + text:{t("config.no.option.selected")}; } #tablePane { 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -67,12 +67,12 @@ // prepare table SwingUtil.setI18nTableHeaderRenderer( table, - n_("config.key"), - n_("config.key.tip"), - n_("config.value"), - n_("config.value.tip"), - n_("config.defaultValue"), - n_("config.defaultValue.tip")); + n("config.key"), + n("config.key.tip"), + n("config.value"), + n("config.value.tip"), + n("config.defaultValue"), + n("config.defaultValue.tip")); ConfigTableRenderer renderer = new ConfigTableRenderer(); SwingUtil.setTableColumnRenderer(table, 0, renderer); @@ -104,16 +104,16 @@ } StringBuilder buffer = new StringBuilder(); if (option == null) { - buffer.append(_("config.no.option.selected")); + buffer.append(t("config.no.option.selected")); } else { - buffer.append(_("config.option.label", option.getKey(), _(option.getDescription()))).append('\n'); + buffer.append(t("config.option.label", option.getKey(), t(option.getDescription()))).append('\n'); if (option.isModified()) { String oValue = option.toString(option.getOriginalValue()); String mValue = option.toString(option.getValue()); - buffer.append(_("config.option.modified", oValue, mValue)).append('\n'); + buffer.append(t("config.option.modified", oValue, mValue)).append('\n'); } if (option.isFinal()) { - buffer.append(_("config.option.final")).append('\n'); + buffer.append(t("config.option.final")).append('\n'); } } description.setText(buffer.toString()); 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -90,19 +90,19 @@ } protected Component getKeyCellRenderer(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column, OptionModel key, boolean isValid, boolean isModified) { - String tooltip = _(key.getDescription()) + " (" + key.getKey() + ")"; + String tooltip = t(key.getDescription()) + " (" + key.getKey() + ")"; String originalValue = key.toString(key.getOriginalValue()); boolean isFinal = key.isFinal(); if (isFinal) { - tooltip += " [" + _("config.unmodifiable") + ']'; + tooltip += " [" + t("config.unmodifiable") + ']'; } if (isModified) { - String s = _("config.modified", originalValue); + String s = t("config.modified", originalValue); value = value + " *"; tooltip += " [" + s + ']'; } if (!isValid) { - String s2 = _("config.unvalid", originalValue, key.getType()); + String s2 = t("config.unvalid", originalValue, key.getType()); tooltip += " (" + s2 + ")"; value = value + " !"; } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -137,12 +137,12 @@ // build categories tabs for (CategoryModel categoryModel : model) { String category = categoryModel.getCategory(); - String categoryLabel = _(categoryModel.getCategoryLabel()); + String categoryLabel = t(categoryModel.getCategoryLabel()); ConfigCategoryUI p = new ConfigCategoryUI( new JAXXInitialContext().add(ui).add(categoryModel)); p.getCategoryLabel().setText(categoryLabel); p.setName(category); - categories.addTab(_(category), null, p, categoryLabel); + categories.addTab(t(category), null, p, categoryLabel); } model.setCategory(defaultCategory); @@ -174,7 +174,7 @@ public void displayUI(Frame parentUI, boolean undecorated) { JDialog f = new JDialog(parentUI, true); - f.setTitle(_("config.title")); + f.setTitle(t("config.title")); f.add(ui); if (parentUI != null) { f.setIconImage(parentUI.getIconImage()); @@ -309,26 +309,26 @@ boolean canContinue = true; ConfigUIModel model = ui.getModel(); CategoryModel categoryModel = model.getCategoryModel(); - String categoryName = _(categoryModel.getCategory()); + String categoryName = t(categoryModel.getCategory()); if (!categoryModel.isValid()) { // the category is not valid // get all the invalid options StringBuilder buffer = new StringBuilder(); - buffer.append(_("config.message.quit.invalid.category", + buffer.append(t("config.message.quit.invalid.category", categoryName)); buffer.append('\n'); for (OptionModel m : categoryModel.getInvalidOptions()) { buffer.append("\n- ").append(m.getKey()); } buffer.append('\n'); - int reponse = askUser(_("config.title.need.confirm"), + int reponse = askUser(t("config.title.need.confirm"), buffer.toString(), JOptionPane.ERROR_MESSAGE, new Object[]{ - _("config.choice.continue"), - _("config.choice.cancel")}, + t("config.choice.continue"), + t("config.choice.cancel")}, 0); switch (reponse) { @@ -348,20 +348,20 @@ // category was modified, ask user if wants to save StringBuilder buffer = new StringBuilder(); - buffer.append(_("config.message.quit.valid.and.modified.category", + buffer.append(t("config.message.quit.valid.and.modified.category", categoryName)).append('\n'); for (OptionModel m : categoryModel.getModifiedOptions()) { buffer.append("\n- ").append(m.getKey()); } buffer.append('\n'); - int reponse = askUser(_("config.title.need.confirm"), + int reponse = askUser(t("config.title.need.confirm"), buffer.toString(), JOptionPane.WARNING_MESSAGE, new Object[]{ - _("config.choice.save"), - _("config.choice.doNotSave"), - _("config.choice.cancel")}, + t("config.choice.save"), + t("config.choice.doNotSave"), + t("config.choice.cancel")}, 0); switch (reponse) { 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -148,7 +148,7 @@ public void addCategory(CategoryModel category) { if (categories.containsKey(category.getCategory())) { throw new IllegalArgumentException( - _("config.error.category.already.exists", + t("config.error.category.already.exists", category.getCategory())); } categories.put(category.getCategory(), category); @@ -162,7 +162,7 @@ public void setCategory(String category) { if (!categories.containsKey(category)) { throw new IllegalArgumentException( - _("config.error.category.not.found", category)); + t("config.error.category.not.found", category)); } CategoryModel newCategoryModel = categories.get(category); setCategoryModel(newCategoryModel); @@ -321,7 +321,7 @@ applicationConfig.save(configFile, false, transients.toArray(new String[transients.size()])); } catch (IOException eee) { if (log.isWarnEnabled()) { - log.warn(_("config.error.applicationconfig.save", configFile), + log.warn(t("config.error.applicationconfig.save", configFile), eee); } } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyDelegateConfig.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -191,12 +191,12 @@ public enum Option implements ConfigOptionDef { - CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, _("jaxxdemo.config.configFileName.description"), "jaxxdemo", String.class, true, true), - FULL_SCREEN("ui.fullscreen", _("jaxxdemo.config.ui.fullscreen"), "false", Boolean.class, false, false), - LOCALE("ui." + PROPERTY_LOCALE, _("jaxxdemo.config.ui." + PROPERTY_LOCALE), Locale.FRANCE.toString(), Locale.class, false, false), - FONT_SIZE("ui." + PROPERTY_FONT_SIZE, _("jaxxdemo.config.ui." + PROPERTY_FONT_SIZE), "10f", Float.class, false, false), - DEMO_COLOR("ui." + PROPERTY_DEMO_COLOR, _("jaxxdemo.config.ui.demoColor"), "#ffffff", Color.class, false, false), - DEMO_CLASS("ui." + PROPERTY_DEMO_CLASS, _("jaxxdemo.config.ui.demoClass"), "java.io.File", Class.class, false, false); + CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, t("jaxxdemo.config.configFileName.description"), "jaxxdemo", String.class, true, true), + FULL_SCREEN("ui.fullscreen", t("jaxxdemo.config.ui.fullscreen"), "false", Boolean.class, false, false), + LOCALE("ui." + PROPERTY_LOCALE, t("jaxxdemo.config.ui." + PROPERTY_LOCALE), Locale.FRANCE.toString(), Locale.class, false, false), + FONT_SIZE("ui." + PROPERTY_FONT_SIZE, t("jaxxdemo.config.ui." + PROPERTY_FONT_SIZE), "10f", Float.class, false, false), + DEMO_COLOR("ui." + PROPERTY_DEMO_COLOR, t("jaxxdemo.config.ui.demoColor"), "#ffffff", Color.class, false, false), + DEMO_CLASS("ui." + PROPERTY_DEMO_CLASS, t("jaxxdemo.config.ui.demoClass"), "java.io.File", Class.class, false, false); public final String key; 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-config/src/test/java/jaxx/runtime/swing/config/model/MyInheritedConfig.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -203,12 +203,12 @@ public enum Option implements ConfigOptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, _("jaxxdemo.config.configFileName.description"), "jaxxdemo", String.class, true, true), - FULL_SCREEN("ui.fullscreen", _("jaxxdemo.config.ui.fullscreen"), "false", Boolean.class, false, false), - LOCALE("ui." + PROPERTY_LOCALE, _("jaxxdemo.config.ui." + PROPERTY_LOCALE), Locale.FRANCE.toString(), Locale.class, false, false), - FONT_SIZE("ui." + PROPERTY_FONT_SIZE, _("jaxxdemo.config.ui." + PROPERTY_FONT_SIZE), "10f", Float.class, false, false), - DEMO_COLOR("ui." + PROPERTY_DEMO_COLOR, _("jaxxdemo.config.ui.demoColor"), "#ffffff", Color.class, false, false), - DEMO_CLASS("ui." + PROPERTY_DEMO_CLASS, _("jaxxdemo.config.ui.demoClass"), "java.io.File", Class.class, false, false); + CONFIG_FILE(CONFIG_FILE_NAME, t("jaxxdemo.config.configFileName.description"), "jaxxdemo", String.class, true, true), + FULL_SCREEN("ui.fullscreen", t("jaxxdemo.config.ui.fullscreen"), "false", Boolean.class, false, false), + LOCALE("ui." + PROPERTY_LOCALE, t("jaxxdemo.config.ui." + PROPERTY_LOCALE), Locale.FRANCE.toString(), Locale.class, false, false), + FONT_SIZE("ui." + PROPERTY_FONT_SIZE, t("jaxxdemo.config.ui." + PROPERTY_FONT_SIZE), "10f", Float.class, false, false), + DEMO_COLOR("ui." + PROPERTY_DEMO_COLOR, t("jaxxdemo.config.ui.demoColor"), "#ffffff", Color.class, false, false), + DEMO_CLASS("ui." + PROPERTY_DEMO_CLASS, t("jaxxdemo.config.ui.demoClass"), "java.io.File", Class.class, false, false); public final String key; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -141,7 +141,7 @@ String value = (String) helpMapping.get(helpId); if (value == null) { - throw new RuntimeException(_("jaxxdemo.context.helpPage.notFound", helpId)); + throw new RuntimeException(t("jaxxdemo.context.helpPage.notFound", helpId)); } String helpDirectory = getConfig().getHelpResourceWithLocale(value); @@ -162,10 +162,10 @@ if (log.isInfoEnabled()) { log.info("help-uri: " + resolvedUri); } - getMainUI().getP().setStatus(_("jaxxdemo.openHelp", helpId)); + getMainUI().getP().setStatus(t("jaxxdemo.openHelp", helpId)); // SwingUtil.openLink(resolvedUri); // } catch (URISyntaxException e) { -// throw new RuntimeException(_("jaxxdemo.context.helpPage.notFound", resolvedUri)); +// throw new RuntimeException(t("jaxxdemo.context.helpPage.notFound", resolvedUri)); // } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -376,42 +376,42 @@ CONFIG_FILE( ApplicationConfig.CONFIG_FILE_NAME, - _("jaxxdemo.config.configFileName.description"), + t("jaxxdemo.config.configFileName.description"), "jaxxdemo", String.class, true, true), FULL_SCREEN( "ui.fullscreen", - _("jaxxdemo.config.ui.fullscreen"), + t("jaxxdemo.config.ui.fullscreen"), "false", Boolean.class, false, false), LOCALE( "ui." + PROPERTY_LOCALE, - _("jaxxdemo.config.ui.locale"), + t("jaxxdemo.config.ui.locale"), Locale.FRANCE.toString(), Locale.class, false, false), FONT_SIZE( "ui." + PROPERTY_FONT_SIZE, - _("jaxxdemo.config.ui.fontSize"), + t("jaxxdemo.config.ui.fontSize"), "10f", Float.class, false, false), DEMO_COLOR( "ui." + PROPERTY_DEMO_COLOR, - _("jaxxdemo.config.ui.demoColor"), + t("jaxxdemo.config.ui.demoColor"), "#ffffff", Color.class, false, false), DEMO_CLASS( "ui." + PROPERTY_DEMO_CLASS, - _("jaxxdemo.config.ui.demoClass"), + t("jaxxdemo.config.ui.demoClass"), "java.io.File", Class.class, false, @@ -419,28 +419,28 @@ LOG_LEVEL( "ui." + PROPERTY_LOG_LEVEL, - _("jaxxdemo.config.ui.logLevel"), + t("jaxxdemo.config.ui.logLevel"), "INFO", String.class, false, false), LOG_PATTERN_LAYOUT( "ui." + PROPERTY_LOG_PATTERN_LAYOUT, - _("jaxxdemo.config.ui.logPatternLayout"), + t("jaxxdemo.config.ui.logPatternLayout"), "%5p [%t] (%F:%L) %M - %m%n", String.class, false, false), KEY_OPEN_CONFIG( "ui." + PROPERTY_KEY_OPEN_CONFIG, - _("jaxxdemo.config.ui.keyOpenConfig"), + t("jaxxdemo.config.ui.keyOpenConfig"), "ctrl alt pressed S", KeyStroke.class, false, false), DEMO_PATH( "ui.demo.path", - _("jaxxdemo.config.ui.demo.path"), + t("jaxxdemo.config.ui.demo.path"), "jaxxdemo.tree/jaxxdemo.component.swing/jaxxdemo.component.swing.buttons/" + JButtonDemo.class.getSimpleName(), String.class, false, Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -441,30 +441,30 @@ ConfigUIHelper helper = new ConfigUIHelper(config); helper.registerCallBack("ui", - n_("demo.action.reload.ui"), + n("demo.action.reload.ui"), SwingUtil.createActionIcon("reload-ui"), reloadUICallback); helper.registerCallBack("application", - n_("demo.action.reload.application"), + n("demo.action.reload.application"), SwingUtil.createActionIcon("reload-application"), reloadApplicationCallback); helper.registerCallBack("log", - n_("demo.action.reload.logAppender"), + n("demo.action.reload.logAppender"), SwingUtil.createActionIcon("reload-log"), reloadLogAppenderCallback); // categorie repertoires - helper.addCategory(n_("jaxxdemo.config.category.directories"), - n_("jaxxdemo.config.category.directories.description")); + helper.addCategory(n("jaxxdemo.config.category.directories"), + n("jaxxdemo.config.category.directories.description")); helper.addOption(DemoConfig.Option.CONFIG_FILE); // others - helper.addCategory(n_("jaxxdemo.config.category.other"), - n_("jaxxdemo.config.category.other.description")); + helper.addCategory(n("jaxxdemo.config.category.other"), + n("jaxxdemo.config.category.other.description")); helper.addOption(DemoConfig.Option.FULL_SCREEN). setOptionPropertyName(DemoConfig.PROPERTY_FULLSCREEN). @@ -523,7 +523,7 @@ public void showLogs(DemoUI ui) { JAXXLog4jUI log4jUI = new JAXXLog4jUI(); - String title = _("jaxxdemo.title.showLog"); + String title = t("jaxxdemo.title.showLog"); log4jUI.setTitle(title); log4jUI.showInDialog(ui, false); } @@ -535,7 +535,7 @@ URL siteURL = config.getApplicationSiteUrl(); - log.info(_("jaxxdemo.message.goto.site", siteURL)); + log.info(t("jaxxdemo.message.goto.site", siteURL)); if (log.isDebugEnabled()) { log.debug("goto " + siteURL); @@ -559,8 +559,8 @@ String thirdPartyPath = config.getThirdParty(); AboutPanel about = new AboutPanel(); - about.setTitle(_("jaxxdemo.title.about")); - about.setAboutText(_("jaxxdemo.about.message")); + about.setTitle(t("jaxxdemo.title.about")); + about.setAboutText(t("jaxxdemo.about.message")); about.setBottomText(ui.getConfig().getCopyrightText()); about.setIconPath(iconPath); about.setLicenseFile(licensePath); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -97,7 +97,7 @@ log.debug("i18n loading time : " + StringUtil.convertTime(t00, System.nanoTime())); } - log.info(_("jaxxdemo.message.config.loaded", config.getVersion())); + log.info(t("jaxxdemo.message.config.loaded", config.getVersion())); // init jaxx logger JAXXLog4jUI.init(config.getLogLevel(), config.getLogPatternLayout()); @@ -107,9 +107,9 @@ SwingUtil.initNimbusLoookAndFeel(); } catch (Exception e) { // could not find nimbus look-and-feel - log.warn(_("jaxxdemo.warning.nimbus.landf")); + log.warn(t("jaxxdemo.warning.nimbus.landf")); } catch (Throwable e) { - log.warn(_("jaxxdemo.warning.no.ui")); + log.warn(t("jaxxdemo.warning.no.ui")); } @@ -117,14 +117,14 @@ log.debug("init done in " + StringUtil.convertTime(t0, System.nanoTime())); } - log.info(_("jaxxdemo.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); + log.info(t("jaxxdemo.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); // on affiche l'ui principale DemoUIHandler handler = new DemoUIHandler(); DemoUI ui = handler.initUI(rootContext, config); - log.info(_("jaxxdemo.init.ui.done")); + log.info(t("jaxxdemo.init.ui.done")); DemoApplicationContext.MAIN_UI.setContextValue(rootContext, ui); @@ -150,7 +150,7 @@ // force to kill main thread - log.info(_("jaxxdemo.init.closed", new Date())); + log.info(t("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/BeanComboBoxDemo.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemo.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -22,7 +22,7 @@ * #L% */ #configurationPanel { - border: {new TitledBorder(_("jaxxdemo.beancomboboxdemo.configuration"))}; + border: {new TitledBorder(t("jaxxdemo.beancomboboxdemo.configuration"))}; } #autoCompleteButton { @@ -48,7 +48,7 @@ } #resultPanel { - border: {new TitledBorder(_("jaxxdemo.beancomboboxdemo.result"))}; + border: {new TitledBorder(t("jaxxdemo.beancomboboxdemo.result"))}; } #selectedResult { 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanComboBoxDemoHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -62,17 +62,17 @@ String result; if (people == null) { - result = _("jaxxdemo.beancomboboxdemo.no.people.selected"); + result = t("jaxxdemo.beancomboboxdemo.no.people.selected"); } else { - result = _("jaxxdemo.beancomboboxdemo.selected.people", decorator.toString(people)); + result = t("jaxxdemo.beancomboboxdemo.selected.people", decorator.toString(people)); } return result; } static { - n_("jaxxdemo.common.people"); - n_("jaxxdemo.common.firstName"); - n_("jaxxdemo.common.lastName"); - n_("jaxxdemo.common.age"); + n("jaxxdemo.common.people"); + n("jaxxdemo.common.firstName"); + n("jaxxdemo.common.lastName"); + n("jaxxdemo.common.age"); } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanDoubleListDemo.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -22,7 +22,7 @@ * #L% */ #configurationPanel { - border: {new TitledBorder(_("jaxxdemo.beandoublelistdemo.configuration"))}; + border: {new TitledBorder(t("jaxxdemo.beandoublelistdemo.configuration"))}; } #filterableButton { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemo.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -22,7 +22,7 @@ * #L% */ #configurationPanel { - border: {new TitledBorder(_("jaxxdemo.beanfilterablecomboboxdemo.configuration"))}; + border: {new TitledBorder(t("jaxxdemo.beanfilterablecomboboxdemo.configuration"))}; } #filterableButton { @@ -54,7 +54,7 @@ } #resultPanel { - border: {new TitledBorder(_("jaxxdemo.beanfilterablecomboboxdemo.result"))}; + border: {new TitledBorder(t("jaxxdemo.beanfilterablecomboboxdemo.result"))}; } #selectedResult { 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/BeanFilterableComboBoxDemoHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -64,17 +64,17 @@ String result; if (people == null || !People.class.isInstance(people)) { - result = _("jaxxdemo.beanfilterablecomboboxdemo.no.people.selected"); + result = t("jaxxdemo.beanfilterablecomboboxdemo.no.people.selected"); } else { - result = _("jaxxdemo.beanfilterablecomboboxdemo.selected.people", decorator.toString(people)); + result = t("jaxxdemo.beanfilterablecomboboxdemo.selected.people", decorator.toString(people)); } return result; } static { - n_("jaxxdemo.common.people"); - n_("jaxxdemo.common.firstName"); - n_("jaxxdemo.common.lastName"); - n_("jaxxdemo.common.age"); + n("jaxxdemo.common.people"); + n("jaxxdemo.common.firstName"); + n("jaxxdemo.common.lastName"); + n("jaxxdemo.common.age"); } } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -23,7 +23,7 @@ */ #config { - border: {new TitledBorder(_("jaxxdemo.numbereditor.configuration"))}; + border: {new TitledBorder(t("jaxxdemo.numbereditor.configuration"))}; } #latitudeShowReset { @@ -76,7 +76,7 @@ } #latitudePane { - border: {new TitledBorder(_("jaxxdemo.coordinate.latitude"))}; + border: {new TitledBorder(t("jaxxdemo.coordinate.latitude"))}; } #latitudeDmsEditor { @@ -106,7 +106,7 @@ } #longitudePane { - border: {new TitledBorder(_("jaxxdemo.coordinate.longitude"))}; + border: {new TitledBorder(t("jaxxdemo.coordinate.longitude"))}; } #longitudeDmsEditor { @@ -136,7 +136,7 @@ } #result { - border: {new TitledBorder(_("jaxxdemo.coordinate.result"))}; + border: {new TitledBorder(t("jaxxdemo.coordinate.result"))}; } #resultLatitude { 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -164,11 +164,11 @@ } public String getLatitudeText(Float latitude) { - return _("jaxxdemo.coordinate.result.latitude", latitude); + return t("jaxxdemo.coordinate.result.latitude", latitude); } public String getLongitudeText(Float longitude) { - return _("jaxxdemo.coordinate.result.longitude", longitude); + return t("jaxxdemo.coordinate.result.longitude", longitude); } protected CoordinateDemoModel getModel() { 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 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/I18nEditorDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -36,7 +36,7 @@ if (text==null || text.trim().isEmpty()) { return null; } - return new TitledBorder(_(text)); + return new TitledBorder(t(text)); } ]]> </script> @@ -44,7 +44,7 @@ <row> <cell> <JPanel - border='{new TitledBorder(_("jaxxdemo.i18neditor.configuration"))}' + border='{new TitledBorder(t("jaxxdemo.i18neditor.configuration"))}' layout='{new GridLayout(0,1)}'> <JCheckBox id='showText' @@ -67,7 +67,7 @@ <JLabel text='jaxxdemo.i18neditor.popupBorderText' labelFor='{popupBorderText}'/> <JTextField id='popupBorderText' - text='{_("jaxxdemo.i18neditor.popup.title")}'/> + text='{t("jaxxdemo.i18neditor.popup.title")}'/> </JPanel> </JPanel> @@ -87,7 +87,7 @@ <row> <cell> <JLabel - border='{new TitledBorder(_("jaxxdemo.i18neditor.selected.locale"))}' + border='{new TitledBorder(t("jaxxdemo.i18neditor.selected.locale"))}' text='{editor.getSelectedLocale().toString()}'/> </cell> </row> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -27,6 +27,7 @@ <import> jaxx.runtime.swing.editor.NumberEditor + static org.nuiton.i18n.I18n.t </import> <!-- model --> @@ -50,7 +51,7 @@ <row> <cell> <JPanel - border='{new TitledBorder(_("jaxxdemo.numbereditor.configuration"))}' + border='{new TitledBorder(t("jaxxdemo.numbereditor.configuration"))}' layout='{new GridLayout(0,1)}'> <JCheckBox id='useFloat' @@ -73,7 +74,7 @@ text='jaxxdemo.numbereditor.autoPopup' selected='false'/> <JPanel - border='{new TitledBorder(_("jaxxdemo.numbereditor.numberPattern.configuration"))}' + border='{new TitledBorder(t("jaxxdemo.numbereditor.numberPattern.configuration"))}' layout='{new GridLayout(1,0)}'> <JTextField id='numberPattern' text='{"\\d{0,3}"}'/> <JButton id='applyNumberPattern' @@ -98,14 +99,14 @@ </row> <row> <cell> - <JPanel border='{new TitledBorder(_("jaxxdemo.numbereditor.model"))}' + <JPanel border='{new TitledBorder(t("jaxxdemo.numbereditor.model"))}' layout='{new GridLayout(0,1)}'> <JLabel - text='{_("jaxxdemo.numbereditor.model.numberPattern", editor.getNumberPattern())}'/> + text='{t("jaxxdemo.numbereditor.model.numberPattern", editor.getNumberPattern())}'/> <JLabel - text='{_("jaxxdemo.numbereditor.model.int", demoModel.getIntegerProperty())}'/> + text='{t("jaxxdemo.numbereditor.model.int", demoModel.getIntegerProperty())}'/> <JLabel - text='{_("jaxxdemo.numbereditor.model.float", demoModel.getFloatProperty())}'/> + text='{t("jaxxdemo.numbereditor.model.float", demoModel.getFloatProperty())}'/> </JPanel> </cell> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -23,18 +23,18 @@ * #L% */ #configPanel { - border:{new TitledBorder(_("jaxxdemo.numbereditor.configuration"))}; + border:{new TitledBorder(t("jaxxdemo.numbereditor.configuration"))}; layout:{new GridLayout(0,1)}; } #editor { property:"time"; - border:{new TitledBorder(_("jaxxdemo.timeeditor.editor"))}; + border:{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}; bean:{demoModel}; date:{demoModel.getTime()}; } #resultPane { - border:{new TitledBorder(_("jaxxdemo.timeeditor.model"))}; + border:{new TitledBorder(t("jaxxdemo.timeeditor.model"))}; layout:{new BorderLayout()}; } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -63,7 +63,7 @@ <row> <cell> <SimpleTimeEditor id='editor' constructorParams='this' - border='{new TitledBorder(_("jaxxdemo.timeeditor.editor"))}'/> + border='{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}'/> </cell> </row> <row> @@ -72,7 +72,7 @@ <JPanel id='resultPane'> <JLabel constraints='BorderLayout.CENTER' - text='{_("jaxxdemo.timeeditor.value", demoModel.getTime())}'/> + text='{t("jaxxdemo.timeeditor.value", demoModel.getTime())}'/> </JPanel> </cell> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -23,7 +23,7 @@ * #L% */ #configPanel { - border:{new TitledBorder(_("jaxxdemo.numbereditor.configuration"))}; + border:{new TitledBorder(t("jaxxdemo.numbereditor.configuration"))}; layout:{new GridLayout(0,1)}; } @@ -32,19 +32,19 @@ } #labelConfig { - text:{_("jaxxdemo.timeeditor.editor")}; + text:{t("jaxxdemo.timeeditor.editor")}; } /*FIXME tchemit 2010-09-02 make this works #editor { property:"time"; - border:{new TitledBorder(_("jaxxdemo.timeeditor.editor"))}; + border:{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}; bean:{demoModel}; date:{demoModel.getTime()}; label:{labelConfig.getText()}; }*/ #resultPane { - border:{new TitledBorder(_("jaxxdemo.timeeditor.model"))}; + border:{new TitledBorder(t("jaxxdemo.timeeditor.model"))}; layout:{new BorderLayout()}; } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -26,6 +26,7 @@ <import> jaxx.runtime.swing.editor.TimeEditor + static org.nuiton.i18n.I18n.t </import> <!-- model --> @@ -83,7 +84,7 @@ <row> <cell> <TimeEditor id='editor' constructorParams='this' property='time' - border='{new TitledBorder(_("jaxxdemo.timeeditor.editor"))}' + border='{new TitledBorder(t("jaxxdemo.timeeditor.editor"))}' bean='{demoModel}' date="{demoModel.getTime()}" label="{labelConfig.getText()}"/> @@ -95,7 +96,7 @@ <JPanel id='resultPane'> <JLabel constraints='BorderLayout.CENTER' - text='{_("jaxxdemo.timeeditor.value", demoModel.getTime())}'/> + text='{t("jaxxdemo.timeeditor.value", demoModel.getTime())}'/> </JPanel> </cell> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/swing/JComboBoxDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -27,7 +27,7 @@ <jaxx.demo.DemoPanel> <import> javax.swing.DefaultComboBoxModel - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n </import> <script><![CDATA[ @@ -44,9 +44,9 @@ <cell> <JAXXComboBox id='jaxxComboBox' editable='true'> - <item value='{_("OK")}' selected='true'/> - <item value='{_("Cancel")}'/> - <item value='{_("Help")}'/> + <item value='{t("OK")}' selected='true'/> + <item value='{t("Cancel")}'/> + <item value='{t("Help")}'/> </JAXXComboBox> </cell> @@ -62,7 +62,7 @@ <cell> <JComboBox id='comboBox' editable='true' - model='{new DefaultComboBoxModel(new Object[]{n_("OK"),n_("Cancel"),n_("Help")})}'/> + model='{new DefaultComboBoxModel(new Object[]{n("OK"),n("Cancel"),n("Help")})}'/> </cell> <cell> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -26,7 +26,7 @@ import org.jdesktop.beans.AbstractSerializableBean; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Abstract demo bean. @@ -37,8 +37,8 @@ public abstract class AbstractDemoBean extends AbstractSerializableBean { static { - n_("jaxxdemo.common.id"); - n_("jaxxdemo.common.image"); + n("jaxxdemo.common.id"); + n("jaxxdemo.common.image"); } public static final String PROPERTY_ID = "id"; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/Movie.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit@codelutin.com> @@ -40,10 +40,10 @@ public class Movie extends AbstractDemoBean { static { - n_("jaxxdemo.common.movie"); - n_("jaxxdemo.common.title"); - n_("jaxxdemo.common.year"); - n_("jaxxdemo.common.actors"); + n("jaxxdemo.common.movie"); + n("jaxxdemo.common.title"); + n("jaxxdemo.common.year"); + n("jaxxdemo.common.actors"); } protected String title; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/People.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -28,7 +28,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit@codelutin.com> @@ -37,10 +37,10 @@ public class People extends AbstractDemoBean { static { - n_("jaxxdemo.common.people"); - n_("jaxxdemo.common.firstName"); - n_("jaxxdemo.common.lastName"); - n_("jaxxdemo.common.age"); + n("jaxxdemo.common.people"); + n("jaxxdemo.common.firstName"); + n("jaxxdemo.common.lastName"); + n("jaxxdemo.common.age"); } public static final String PROPERTY_FIRST_NAME = "firstName"; Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -60,7 +60,7 @@ import java.util.ArrayList; import java.util.List; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Handler of all uis in the Nave demo. @@ -74,9 +74,9 @@ protected NavDemo ui; - public static String MOVIES_CATEGORY_NODE = n_("jaxxdemo.common.movies"); + public static String MOVIES_CATEGORY_NODE = n("jaxxdemo.common.movies"); - public static String ACTORS_CATEGORY_NODE = n_("jaxxdemo.common.actors"); + public static String ACTORS_CATEGORY_NODE = n("jaxxdemo.common.actors"); @Override public void beforeInit(NavDemo ui) { 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorContentUI.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -40,7 +40,7 @@ verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> <JTextPane editable='false' font-size='11' - border='{new TitledBorder(_("jaxxdemo.navigation.actor.title"))}' + border='{new TitledBorder(t("jaxxdemo.navigation.actor.title"))}' text='{getHandler().getContent(getData())}'/> </JScrollPane> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/ActorsContentUI.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -29,6 +29,8 @@ jaxx.demo.entities.People jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer + + static org.nuiton.i18n.I18n.t </import> <java.util.List id='data' genericType='People' javaBean='null'/> @@ -42,7 +44,7 @@ <JPanel layout='{new BorderLayout()}'> <JScrollPane - border='{new TitledBorder(_("jaxxdemo.navigation.actors.title"))}' + border='{new TitledBorder(t("jaxxdemo.navigation.actors.title"))}' constraints='BorderLayout.CENTER' columnHeaderView='{toolbar}' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MovieContentUI.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -40,7 +40,7 @@ verticalScrollBarPolicy='{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}'> <JTextPane - border='{new TitledBorder(_("jaxxdemo.navigation.movie.title"))}' + border='{new TitledBorder(t("jaxxdemo.navigation.movie.title"))}' editable='false' font-size='11' text='{getHandler().getContent(getData())}'/> </JScrollPane> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/content/MoviesContentUI.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -29,6 +29,8 @@ jaxx.demo.entities.Movie jaxx.runtime.swing.editor.bean.BeanListHeader jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer + + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ @@ -42,7 +44,7 @@ <JPanel layout='{new BorderLayout()}'> <JScrollPane - border='{new TitledBorder(_("jaxxdemo.navigation.movies.title"))}' + border='{new TitledBorder(t("jaxxdemo.navigation.movies.title"))}' constraints='BorderLayout.CENTER' columnHeaderView='{toolbar}' horizontalScrollBarPolicy='{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}' Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/tree/MoviesTreeNodeLoador.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -34,7 +34,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author sletellier <letellier@codelutin.com> @@ -83,7 +83,7 @@ // Create clients category node actorsCategoryNode = new NavDemoTreeNode( String.class, - n_(NavDemoHandler.ACTORS_CATEGORY_NODE), + n(NavDemoHandler.ACTORS_CATEGORY_NODE), null, NavHelper.getChildLoador(ActorsTreeNodeLoador.class) ); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/MoviesTreeTableNodeLoador.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -34,7 +34,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author sletellier <letellier@codelutin.com> @@ -84,7 +84,7 @@ // Create clients category node actorsCategoryNode = new NavDemoTreeTableNode( String.class, - n_(NavDemoHandler.ACTORS_CATEGORY_NODE), + n(NavDemoHandler.ACTORS_CATEGORY_NODE), null, NavHelper.getChildLoador(ActorsTreeTableNodeLoador.class) ); 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/treetable/NavDemoTreeTableModel.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -55,7 +55,7 @@ // If it's category node if (node.isStringNode()) { if (i == 0) { - return _(id); + return t(id); } return ""; @@ -107,9 +107,9 @@ @Override public String[] getColumnsNames() { - return new String[]{_("jaxxdemo.common.firstName"), - _("jaxxdemo.common.lastName"), - _("jaxxdemo.common.age")}; + return new String[]{t("jaxxdemo.common.firstName"), + t("jaxxdemo.common.lastName"), + t("jaxxdemo.common.age")}; } @Override Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -28,7 +28,7 @@ <import> org.jdesktop.swingx.JXTable javax.swing.JOptionPane - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n jaxx.demo.entities.People org.nuiton.validator.bean.list.BeanListValidator jaxx.runtime.validator.swing.SwingListValidatorMessageTableModel Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/list/ListBeanValidationDemoHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -43,7 +43,7 @@ import java.util.Arrays; import java.util.UUID; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Handler of UI {@link ListBeanValidationDemo}. @@ -71,14 +71,14 @@ Arrays.asList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); SwingUtil.setI18nTableHeaderRenderer( dataTable, - n_("jaxx.demo.label.id"), - n_("jaxx.demo.label.id.tip"), - n_("jaxx.demo.label.firstName"), - n_("jaxx.demo.label.firstName.tip"), - n_("jaxx.demo.label.lastName"), - n_("jaxx.demo.label.lastName.tip"), - n_("jaxx.demo.label.age"), - n_("jaxx.demo.label.age.tip")); + n("jaxx.demo.label.id"), + n("jaxx.demo.label.id.tip"), + n("jaxx.demo.label.firstName"), + n("jaxx.demo.label.firstName.tip"), + n("jaxx.demo.label.lastName"), + n("jaxx.demo.label.lastName.tip"), + n("jaxx.demo.label.age"), + n("jaxx.demo.label.age.tip")); SwingUtil.fixTableColumnWidth(dataTable, 3, 35); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByListDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -28,7 +28,7 @@ <import> javax.swing.JOptionPane - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n jaxx.demo.entities.Identity jaxx.demo.entities.Model jaxx.runtime.validator.swing.SwingValidatorMessageListRenderer @@ -93,7 +93,7 @@ </cell> <cell weightx='1'> <JTextField id='text' text='{model1.getText()}' - _validatorLabel='{n_("form.text")}' + _validatorLabel='{n("form.text")}' onKeyReleased='model1.setText(text.getText())'/> </cell> </row> @@ -103,7 +103,7 @@ </cell> <cell weightx='1'> <JTextField id='text2' text='{model1.getText2()}' - _validatorLabel='{n_("form.text2")}' + _validatorLabel='{n("form.text2")}' onKeyReleased='model1.setText2(text2.getText())'/> </cell> </row> @@ -115,7 +115,7 @@ <cell> <JSlider id='ratio' minimum='0' maximum='100' value='{model1.getRatio()}' - _validatorLabel='{n_("form.ratio")}' + _validatorLabel='{n("form.ratio")}' onStateChanged='model1.setRatio(ratio.getValue())'/> </cell> </row> @@ -166,7 +166,7 @@ </cell> <cell weightx='1'> <JTextField id='_text' text='{model2.getText()}' - _validatorLabel='{n_("form2.text")}' + _validatorLabel='{n("form2.text")}' onKeyReleased='model2.setText(_text.getText())'/> </cell> </row> @@ -176,7 +176,7 @@ </cell> <cell weightx='1'> <JTextField id='_text2' text='{model2.getText2()}' - _validatorLabel='{n_("form2.text2")}' + _validatorLabel='{n("form2.text2")}' onKeyReleased='model2.setText2(_text2.getText())'/> </cell> </row> @@ -188,7 +188,7 @@ <cell> <JSlider id='_ratio' minimum='0' maximum='100' value='{model2.getRatio()}' - _validatorLabel='{n_("form2.ratio")}' + _validatorLabel='{n("form2.ratio")}' onStateChanged='model2.setRatio(_ratio.getValue())'/> </cell> </row> Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/validation/simple/SimpleBeanValidationByTableDemo.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -28,7 +28,7 @@ <import> javax.swing.JOptionPane - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n jaxx.demo.entities.Identity jaxx.demo.entities.Model jaxx.runtime.validator.swing.SwingValidatorUtil @@ -99,7 +99,7 @@ <cell weightx='1'> <JTextField id='text' text='{model1.getText()}' onKeyReleased='model1.setText(text.getText())' - _validatorLabel='{n_("form.text")}' + _validatorLabel='{n("form.text")}' /> </cell> </row> @@ -110,7 +110,7 @@ <cell weightx='1'> <JTextField id='text2' text='{model1.getText2()}' onKeyReleased='model1.setText2(text2.getText())' - _validatorLabel='{n_("form.text2")}' + _validatorLabel='{n("form.text2")}' /> </cell> </row> @@ -122,7 +122,7 @@ <cell> <JSlider id='ratio' minimum='0' maximum='100' value='{model1.getRatio()}' - _validatorLabel='{n_("form.ratio")}' + _validatorLabel='{n("form.ratio")}' onStateChanged='model1.setRatio(ratio.getValue())'/> </cell> </row> @@ -173,7 +173,7 @@ </cell> <cell weightx='1'> <JTextField id='_text' text='{model2.getText()}' - _validatorLabel='{n_("form2.text")}' + _validatorLabel='{n("form2.text")}' onKeyReleased='model2.setText(_text.getText())'/> </cell> </row> @@ -183,7 +183,7 @@ </cell> <cell weightx='1'> <JTextField id='_text2' text='{model2.getText2()}' - _validatorLabel='{n_("form2.text2")}' + _validatorLabel='{n("form2.text2")}' onKeyReleased='model2.setText2(_text2.getText())'/> </cell> </row> @@ -195,7 +195,7 @@ <cell> <JSlider id='_ratio' minimum='0' maximum='100' value='{model2.getRatio()}' - _validatorLabel='{n_("form2.ratio")}' + _validatorLabel='{n("form2.ratio")}' onStateChanged='model2.setRatio(_ratio.getValue())'/> </cell> </row> 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoCellRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -70,7 +70,7 @@ if (node.isStringNode()) { // String node - toDecorate = _(id); + toDecorate = t(id); } else { // Demo node Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/tree/DemoDataProvider.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -75,7 +75,7 @@ import jaxx.demo.component.jaxx.editor.BeanDoubleListDemo; import jaxx.demo.component.jaxx.editor.BeanFilterableComboBoxDemo; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Data provider of the navigation tree. @@ -100,64 +100,64 @@ } addMapping("jaxxdemo.tree", - n_("jaxxdemo.component.swing"), - n_("jaxxdemo.component.jaxx"), - n_("jaxxdemo.feature"), - n_("jaxxdemo.fun") + n("jaxxdemo.component.swing"), + n("jaxxdemo.component.jaxx"), + n("jaxxdemo.feature"), + n("jaxxdemo.fun") ); - addMapping(n_("jaxxdemo.component.swing"), - n_("jaxxdemo.component.swing.buttons"), - n_("jaxxdemo.component.swing.form"), - n_("jaxxdemo.component.swing.layout"), - n_("jaxxdemo.component.swing.menu"), - n_("jaxxdemo.component.swing.window"), + addMapping(n("jaxxdemo.component.swing"), + n("jaxxdemo.component.swing.buttons"), + n("jaxxdemo.component.swing.form"), + n("jaxxdemo.component.swing.layout"), + n("jaxxdemo.component.swing.menu"), + n("jaxxdemo.component.swing.window"), JProgressBarDemo.class ); - addMapping(n_("jaxxdemo.component.swing.buttons"), + addMapping(n("jaxxdemo.component.swing.buttons"), JButtonDemo.class, JCheckBoxDemo.class, JRadioButtonDemo.class, JToggleButtonDemo.class ); - addMapping(n_("jaxxdemo.component.swing.form"), - n_("jaxxdemo.component.swing.form.text"), + addMapping(n("jaxxdemo.component.swing.form"), + n("jaxxdemo.component.swing.form.text"), JComboBoxDemo.class, JListDemo.class, JSliderDemo.class, JSpinnerDemo.class ); - addMapping(n_("jaxxdemo.component.swing.form.text"), + addMapping(n("jaxxdemo.component.swing.form.text"), JPasswordFieldDemo.class, JTextFieldDemo.class, JTextAreaDemo.class ); - addMapping(n_("jaxxdemo.component.swing.layout"), + addMapping(n("jaxxdemo.component.swing.layout"), JSplitPaneDemo.class ); - addMapping(n_("jaxxdemo.component.swing.menu"), + addMapping(n("jaxxdemo.component.swing.menu"), JMenuItemDemo.class, JCheckBoxMenuItemDemo.class, JRadioButtonMenuItemDemo.class ); - addMapping(n_("jaxxdemo.component.swing.window"), + addMapping(n("jaxxdemo.component.swing.window"), JDialogDemo.class ); - addMapping(n_("jaxxdemo.component.jaxx"), + addMapping(n("jaxxdemo.component.jaxx"), HidorButtonDemo.class, - n_("jaxxdemo.component.jaxx.editor"), + n("jaxxdemo.component.jaxx.editor"), StatusMessagePanelDemo.class, BoxedDecoratorDemo.class ); - addMapping(n_("jaxxdemo.component.jaxx.editor"), + addMapping(n("jaxxdemo.component.jaxx.editor"), TimeEditorDemo.class, SimpleTimeEditorDemo.class, NumberEditorDemo.class, @@ -172,35 +172,35 @@ CoordinateDemo.class ); - addMapping(n_("jaxxdemo.feature"), - n_("jaxxdemo.feature.databinding"), - n_("jaxxdemo.feature.validation"), - n_("jaxxdemo.feature.nav") + addMapping(n("jaxxdemo.feature"), + n("jaxxdemo.feature.databinding"), + n("jaxxdemo.feature.validation"), + n("jaxxdemo.feature.nav") ); - addMapping(n_("jaxxdemo.feature.databinding"), + addMapping(n("jaxxdemo.feature.databinding"), BindingExtremeDemo.class, BeanDataBindingDemo.class ); - addMapping(n_("jaxxdemo.feature.validation"), - n_("jaxxdemo.feature.simple.validation"), - n_("jaxxdemo.feature.list.validation") + addMapping(n("jaxxdemo.feature.validation"), + n("jaxxdemo.feature.simple.validation"), + n("jaxxdemo.feature.list.validation") ); - addMapping(n_("jaxxdemo.feature.simple.validation"), + addMapping(n("jaxxdemo.feature.simple.validation"), SimpleBeanValidationByListDemo.class, SimpleBeanValidationByTableDemo.class ); - addMapping(n_("jaxxdemo.feature.list.validation"), + addMapping(n("jaxxdemo.feature.list.validation"), ListBeanValidationDemo.class ); - addMapping(n_("jaxxdemo.feature.nav"), + addMapping(n("jaxxdemo.feature.nav"), NavDemo.class ); - addMapping(n_("jaxxdemo.fun"), + addMapping(n("jaxxdemo.fun"), LabelStyleDemo.class, CounterDemo.class, CalculatorDemo.class 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/NodeItem.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -141,7 +141,7 @@ public void applyI18n(String prefix, String suffix) { String key = prefix + getAbsoluteTarget() + suffix; - text = _(key); + text = t(key); if (!isLeaf()) { for (NodeItem i : getChilds()) { i.applyI18n(prefix, suffix); Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1751Test.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1751Test.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug1751Test.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -37,7 +37,7 @@ assertNumberJaxxFiles(3); checkPattern(mojo, "implements Serializable", true); - checkPattern(mojo, "setText(_(\"test\"))", true); + checkPattern(mojo, "setText(t(\"test\"))", true); } } \ No newline at end of file Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -31,10 +31,11 @@ import org.apache.maven.plugin.logging.SystemStreamLog; - +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; +@Ignore public class CompilerValidatorTest extends JaxxBaseTest { /** Logger. */ Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/I18nTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/I18nTest.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/I18nTest.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -34,12 +34,12 @@ GenerateMojo mojo = getMojo(); mojo.i18nable = false; mojo.execute(); - checkPattern(mojo, "setText(_(\"test.text\"));", false); + checkPattern(mojo, "setText(t(\"test.text\"));", false); mojo.i18nable = true; mojo.execute(); - checkPattern(mojo, "setText(_(\"test.text\"));", true); - checkPattern(mojo, "\"_(\\\"test.text\\\")\"", false); + checkPattern(mojo, "setText(t(\"test.text\"));", true); + checkPattern(mojo, "t(\\\"test.text\\\")", false); } @Test @@ -47,12 +47,12 @@ GenerateMojo mojo = getMojo(); mojo.i18nable = false; mojo.execute(); - checkPattern(mojo, "setTitle(_(\"test.title\"));", false); + checkPattern(mojo, "setTitle(t(\"test.title\"));", false); mojo.i18nable = true; mojo.execute(); - checkPattern(mojo, "setTitle(_(\"test.title\"));", true); - checkPattern(mojo, "\"_(\\\"test.title\\\")\"", false); + checkPattern(mojo, "setTitle(t(\"test.title\"));", true); + checkPattern(mojo, "t(\\\"test.title\\\")", false); } @Test @@ -60,11 +60,11 @@ GenerateMojo mojo = getMojo(); mojo.i18nable = false; mojo.execute(); - checkPattern(mojo, "setToolTipText(_(\"test.toolTipText\"));", false); + checkPattern(mojo, "setToolTipText(t(\"test.toolTipText\"));", false); mojo.i18nable = true; mojo.execute(); - checkPattern(mojo, "setToolTipText(_(\"test.toolTipText\"));", true); - checkPattern(mojo, "\"_(\\\"test.toolTipText\\\")\"", false); + checkPattern(mojo, "setToolTipText(t(\"test.toolTipText\"));", true); + checkPattern(mojo, "t(\\\"test.toolTipText\\\")", false); } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -1092,7 +1092,7 @@ try { if (!Desktop.isDesktopSupported()) { throw new IllegalStateException( - _("swing.error.desktop.not.supported")); + t("swing.error.desktop.not.supported")); } @@ -1101,7 +1101,7 @@ if (!desktop.isSupported(Desktop.Action.BROWSE)) { throw new IllegalStateException( - _("swing.error.desktop.browse.not.supported")); + t("swing.error.desktop.browse.not.supported")); } URI uri = new URI(url); @@ -1497,7 +1497,7 @@ } catch (Exception e) { throw new RuntimeException( - _("application.error.cannot.open.link", uri), e); + t("application.error.cannot.open.link", uri), e); } } @@ -1505,7 +1505,7 @@ if (!Desktop.isDesktopSupported()) { throw new RuntimeException( - _("application.error.desktop.not.supported")); + t("application.error.desktop.not.supported")); } Desktop desktop = Desktop.getDesktop(); @@ -1513,7 +1513,7 @@ if (!desktop.isSupported(Desktop.Action.BROWSE)) { throw new RuntimeException( - _("application.error.desktop.browse.not.supported")); + t("application.error.desktop.browse.not.supported")); } return desktop; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -24,7 +24,7 @@ * #L% */ -import org.apache.commons.collections.iterators.EnumerationIterator; +import org.apache.commons.collections4.iterators.EnumerationIterator; import javax.swing.tree.DefaultMutableTreeNode; import java.awt.Component; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -24,7 +24,7 @@ * #L% */ -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import javax.swing.AbstractListModel; import javax.swing.DefaultComboBoxModel; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import javax.swing.AbstractListModel; import javax.swing.DefaultListModel; 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/AbstractNavTreeCellRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -100,7 +100,7 @@ // calculer le rendu du noeud if (node.isStringNode()) { - text = _(node.getId()); + text = t(node.getId()); } else { 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -84,7 +84,7 @@ } TableColumn col = table.getColumn(table.getColumnName(column)); int index = col.getModelIndex(); - value = _(keys[index]); + value = t(keys[index]); JComponent rendererComponent = (JComponent) delegate.getTableCellRendererComponent( table, @@ -94,7 +94,7 @@ row, column ); - rendererComponent.setToolTipText(_(tips[index])); + rendererComponent.setToolTipText(t(tips[index])); return rendererComponent; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/session/SwingSession.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -27,8 +27,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -169,8 +169,8 @@ if (oldStepIndex + 1 == newStepIndex) { // creation d'un nouvel onglet WizardStepUI<E, M> c = ui.getStepUI(newStep); - String title = _(newStep.getLabel()); - String tip = _(newStep.getDescription()); + String title = t(newStep.getLabel()); + String tip = t(newStep.getDescription()); tabs.addTab(title, null, (Component) c, tip); // selection du nouvel onglet int index = tabs.indexOfComponent((Component) c); 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SimpleBeanValidatorMessageTableRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -78,20 +78,20 @@ // scope NuitonValidatorScope scope = (NuitonValidatorScope) value; icon = SwingValidatorUtil.getIcon(scope); - String label = _(scope.getLabel()); - toolTipText = _("validator.scope.tip", label); + String label = t(scope.getLabel()); + toolTipText = t("validator.scope.tip", label); break; case 1: // field name text = getFieldName(table, (String) value, row); - toolTipText = _("validator.field.tip", text); + toolTipText = t("validator.field.tip", text); break; case 2: // message text = getMessage(table, (String) value, row); - toolTipText = _("validator.message.tip", text); + toolTipText = t("validator.message.tip", text); break; } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingListValidatorMessageTableRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -74,26 +74,26 @@ // scope NuitonValidatorScope scope = (NuitonValidatorScope) value; icon = SwingValidatorUtil.getIcon(scope); - String label = _(scope.getLabel()); - toolTipText = _("validator.scope.tip", label); + String label = t(scope.getLabel()); + toolTipText = t("validator.scope.tip", label); break; case 1: // row bean text = getBeanValue(table, row); - toolTipText = _("validator.bean.tip", text); + toolTipText = t("validator.bean.tip", text); break; case 2: // field name text = getFieldName(table, (String) value, row); - toolTipText = _("validator.field.tip", text); + toolTipText = t("validator.field.tip", text); break; case 3: // message text = getMessage(table, (String) value, row); - toolTipText = _("validator.message.tip", text); + toolTipText = t("validator.message.tip", text); break; } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -99,9 +99,9 @@ // text to display String text = String.format(format, fieldName, message); - String label = _(model.getScope().getLabel()); - String tmp = _("validator.scope.tip", label); - String tmp2 = _("validator.field.tip", fieldName); + String label = t(model.getScope().getLabel()); + String tmp = t("validator.scope.tip", label); + String tmp2 = t("validator.field.tip", fieldName); String tooltTipText = String.format(formatTip, tmp, tmp2, message); 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -77,20 +77,20 @@ // scope NuitonValidatorScope scope = (NuitonValidatorScope) value; icon = SwingValidatorUtil.getIcon(scope); - String label = _(scope.getLabel()); - toolTipText = _("validator.scope.tip", label); + String label = t(scope.getLabel()); + toolTipText = t("validator.scope.tip", label); break; case 1: // field name text = getFieldName(table, (String) value, row); - toolTipText = _("validator.field.tip", text); + toolTipText = t("validator.field.tip", text); break; case 2: // message text = getMessage(table, (String) value, row); - toolTipText = _("validator.message.tip", text); + toolTipText = t("validator.message.tip", text); break; } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -60,7 +60,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * The helper class for swing validation module. @@ -277,12 +277,12 @@ Arrays.asList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); SwingUtil.setI18nTableHeaderRenderer( errorTable, - n_("validator.scope.header"), - n_("validator.scope.header.tip"), - n_("validator.field.header"), - n_("validator.field.header.tip"), - n_("validator.message.header"), - n_("validator.message.header.tip")); + n("validator.scope.header"), + n("validator.scope.header.tip"), + n("validator.field.header"), + n("validator.field.header.tip"), + n("validator.message.header"), + n("validator.message.header.tip")); // register a single 'goto widget error' mouse listener on errorTable registerErrorTableMouseListener(errorTable); SwingUtil.fixTableColumnWidth(errorTable, 0, 25); @@ -302,12 +302,12 @@ Arrays.asList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); SwingUtil.setI18nTableHeaderRenderer( errorTable, - n_("validator.scope.header"), - n_("validator.scope.header.tip"), - n_("validator.field.header"), - n_("validator.field.header.tip"), - n_("validator.message.header"), - n_("validator.message.header.tip")); + n("validator.scope.header"), + n("validator.scope.header.tip"), + n("validator.field.header"), + n("validator.field.header.tip"), + n("validator.message.header"), + n("validator.message.header.tip")); SwingUtil.fixTableColumnWidth(errorTable, 0, 25); } @@ -326,14 +326,14 @@ Arrays.asList(new RowSorter.SortKey(0, SortOrder.ASCENDING))); SwingUtil.setI18nTableHeaderRenderer( errorTable, - n_("validator.scope.header"), - n_("validator.scope.header.tip"), - n_("validator.bean.header"), - n_("validator.bean.header.tip"), - n_("validator.field.header"), - n_("validator.field.header.tip"), - n_("validator.message.header"), - n_("validator.message.header.tip")); + n("validator.scope.header"), + n("validator.scope.header.tip"), + n("validator.bean.header"), + n("validator.bean.header.tip"), + n("validator.field.header"), + n("validator.field.header.tip"), + n("validator.message.header"), + n("validator.message.header.tip")); SwingUtil.fixTableColumnWidth(errorTable, 0, 25); } 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -185,6 +185,6 @@ void $afterCompleteSetup() { buildTopPanel(); - ui.close.setText(_("aboutframe.ok")); + ui.close.setText(t("aboutframe.ok")); } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -33,6 +33,7 @@ <import> javax.swing.Icon javax.swing.JComponent + static org.nuiton.i18n.I18n.t </import> <HidorButtonHandler id='myHandler' constructorParams='this'/> @@ -43,9 +44,9 @@ <String id='showText' javaBean='""'/> - <String id='hideTip' javaBean='_("hidor.hideTip")'/> + <String id='hideTip' javaBean='t("hidor.hideTip")'/> - <String id='showTip' javaBean='_("hidor.showTip")'/> + <String id='showTip' javaBean='t("hidor.showTip")'/> <script><![CDATA[ Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx 2014-02-04 07:12:14 UTC (rev 2782) @@ -46,7 +46,7 @@ jaxx.runtime.swing.renderer.LocaleListCellRenderer - static org.nuiton.i18n.I18n.n_ + static org.nuiton.i18n.I18n.n </import> <I18nEditorHandler id='handler' constructorParams='this'/> @@ -55,7 +55,7 @@ <String id='notSelectedToolTipText' javaBean='null'/> <Border id='popupBorder' - javaBean='new TitledBorder(_("i18neditor.popup.title"))'/> + javaBean='new TitledBorder(t("i18neditor.popup.title"))'/> <Boolean id='showText' javaBean='Boolean.TRUE'/> <Boolean id='showIcon' javaBean='Boolean.TRUE'/> @@ -95,8 +95,8 @@ onStateChanged='log.info(indexes.getSelectedValue())'/> <script><![CDATA[ -public static final String DEFAULT_SELECTED_TOOLTIP = n_("i18neditor.selected"); -public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n_("i18neditor.unselected"); +public static final String DEFAULT_SELECTED_TOOLTIP = n("i18neditor.selected"); +public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n("i18neditor.unselected"); public static final String LOCALES_PROPERTY = "locales"; public static final String SELECTED_LOCALE_PROPERTY = "selectedLocale"; 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditorHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -64,9 +64,9 @@ this.ui = ui; } - public static final String DEFAULT_SELECTED_TOOLTIP = n_("i18neditor.selected"); + public static final String DEFAULT_SELECTED_TOOLTIP = n("i18neditor.selected"); - public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n_("i18neditor.unselected"); + public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n("i18neditor.unselected"); public static final String LOCALES_PROPERTY = "locales"; @@ -217,7 +217,7 @@ selectedTip = DEFAULT_SELECTED_TOOLTIP; } String tip = ui.renderer.getToolTipText(l); - tip = _(selectedTip, tip); + tip = t(selectedTip, tip); return tip; } @@ -228,7 +228,7 @@ selectedTip = DEFAULT_NOT_SELECTED_TOOLTIP; } String tip = ui.renderer.getToolTipText(l); - tip = _(selectedTip, tip); + tip = t(selectedTip, tip); return tip; } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -31,7 +31,7 @@ } #popup { - border:{new TitledBorder(_("beancombobox.popup.title"))}; + border:{new TitledBorder(t("beancombobox.popup.title"))}; } #popupSortLabel { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -28,7 +28,7 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -52,7 +52,7 @@ } #popup { - border:{new TitledBorder(_("beandoublelist.popup.title"))}; + border:{new TitledBorder(t("beandoublelist.popup.title"))}; } #popupSortLabel { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -31,7 +31,7 @@ } #popup { - border:{ new TitledBorder(_("beancombobox.popup.title")) }; + border:{ new TitledBorder(t("beancombobox.popup.title")) }; } #popupSortLabel { Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -30,7 +30,7 @@ import jaxx.runtime.swing.JAXXButtonGroup; import jaxx.runtime.swing.model.JaxxFilterableComboBoxModel; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.DecoratorUtil; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.css 2014-02-04 07:12:14 UTC (rev 2782) @@ -31,7 +31,7 @@ } #popup { - border:{new TitledBorder(_("beanlist.popup.title"))}; + border:{new TitledBorder(t("beanlist.popup.title"))}; } #popupSortLabel { 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -80,11 +80,11 @@ */ public class BeanUIUtil { - public static final String DEFAULT_POPUP_LABEL = n_("bean.popup.label"); + public static final String DEFAULT_POPUP_LABEL = n("bean.popup.label"); - public static final String DEFAULT_SELECTED_TOOLTIP = n_("bean.sort.on"); + public static final String DEFAULT_SELECTED_TOOLTIP = n("bean.sort.on"); - public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n_("bean.sort.off"); + public static final String DEFAULT_NOT_SELECTED_TOOLTIP = n("bean.sort.off"); public static final Object[] EMPTY_CLASS_ARRAY = new Object[0]; @@ -397,16 +397,16 @@ if (nbContext > 1) { for (int i = 0; i < nbContext; i++) { String property = i18nPrefix + decorator.getProperty(i); - String propertyI18n = _(property); + String propertyI18n = t(property); JRadioButtonMenuItem button = new JRadioButtonMenuItem(propertyI18n); button.putClientProperty(JAXXButtonGroup.BUTTON8GROUP_CLIENT_PROPERTY, indexes); button.putClientProperty(JAXXButtonGroup.VALUE_CLIENT_PROPERTY, i); popup.add(button); if (selectedTip != null) { - button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, _(selectedTip, propertyI18n)); + button.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t(selectedTip, propertyI18n)); } if (notSelectedTip != null) { - button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, _(notSelectedTip, propertyI18n)); + button.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t(notSelectedTip, propertyI18n)); } button.setSelected(false); indexes.add(button); @@ -419,21 +419,21 @@ Class<?> type = decorator.getType(); String beanI18nKey; if (type == null) { - beanI18nKey = n_("bean.unknown.type"); + beanI18nKey = n("bean.unknown.type"); } else { beanI18nKey = i18nPrefix + Introspector.decapitalize(type.getSimpleName()); } - String beanI18n = _(beanI18nKey); - title = _(title, beanI18n); + String beanI18n = t(beanI18nKey); + title = t(title, beanI18n); } else { - title = _(title); + title = t(title); } - sortDown.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, _("bean.sort.down.tip")); - sortDown.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, _("bean.sort.down.toSelect.tip")); + sortDown.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.down.tip")); + sortDown.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.down.toSelect.tip")); - sortUp.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, _("bean.sort.up.tip")); - sortUp.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, _("bean.sort.up.toSelect.tip")); + sortUp.putClientProperty(JAXXButtonGroup.SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.up.tip")); + sortUp.putClientProperty(JAXXButtonGroup.NOT_SELECTED_TIP_CLIENT_PROPERTY, t("bean.sort.up.toSelect.tip")); if (nbContext < 2) { getPopup().remove(popupSeparator); 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmdCoordinateConverter.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -57,7 +57,7 @@ if (!isEnabled(aClass)) { throw new ConversionException( - _("jaxx.error.no.convertor.coordinateDmd", value)); + t("jaxx.error.no.convertor.coordinateDmd", value)); } Object result = null; 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-02 21:00:16 UTC (rev 2781) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/gis/DmsCoordinateConverter.java 2014-02-04 07:12:14 UTC (rev 2782) @@ -57,7 +57,7 @@ if (!isEnabled(aClass)) { throw new ConversionException( - _("jaxx.error.no.convertor.coordinateDms", value)); + t("jaxx.error.no.convertor.coordinateDms", value)); } Object result = null; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-02 21:00:16 UTC (rev 2781) +++ trunk/pom.xml 2014-02-04 07:12:14 UTC (rev 2782) @@ -115,17 +115,17 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> - <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> + <nuitonValidatorVersion>3.0-SNAPSHOT</nuitonValidatorVersion> <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonI18nVersion>3.0-SNAPSHOT</nuitonI18nVersion> <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> <eugeneVersion>2.7.3</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion> <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.5-1</swingXVersion> - <plexusUtilVersion>3.0.15</plexusUtilVersion> + <plexusUtilVersion>3.0.17</plexusUtilVersion> <webstartPluginVersion>1.0-beta-6</webstartPluginVersion> @@ -321,7 +321,6 @@ <dependency> <groupId>com.fifesoft</groupId> <artifactId>rsyntaxtextarea</artifactId> - <!--<version>2.0.7</version>--> <version>2.5.0</version> </dependency>