Author: kmorin Date: 2014-02-06 09:35:48 +0100 (Thu, 06 Feb 2014) New Revision: 6 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/6 Log: replace i18n _ by t Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailIOUtil.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfig.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfigOption.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfigProvider.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/AbstractFaxToMailAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/FaxToMailActionHelper.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/FaxToMailActionUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfig.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfigOption.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfigProvider.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/CloseApplicationAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/GoToPreviousScreenAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/ReloadFaxToMailAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/StartAction.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailErrorHelper.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailIOUtil.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailIOUtil.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailIOUtil.java 2014-02-06 08:35:48 UTC (rev 6) @@ -20,7 +20,7 @@ import java.util.List; import java.util.UUID; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Useful methods around IO, all method errors are boxes a @@ -56,7 +56,7 @@ try { ZipUtil.compressFiles(archiveFile, source, files); } catch (IOException e) { - throw new FaxToMailTechnicalException(_(errorMessage, archiveFile), e); + throw new FaxToMailTechnicalException(t(errorMessage, archiveFile), e); } } @@ -184,7 +184,7 @@ return Files.newReader(file, Charsets.UTF_8); } catch (FileNotFoundException e) { - throw new FaxToMailTechnicalException(_(errorMessage, file), e); + throw new FaxToMailTechnicalException(t(errorMessage, file), e); } } @@ -194,7 +194,7 @@ return Files.newWriter(file, Charsets.UTF_8); } catch (FileNotFoundException e) { - throw new FaxToMailTechnicalException(_(errorMessage, file), e); + throw new FaxToMailTechnicalException(t(errorMessage, file), e); } } @@ -205,7 +205,7 @@ try { ZipUtil.uncompress(file, tempDir); } catch (IOException e) { - throw new FaxToMailTechnicalException(_(errorMessage, file), e); + throw new FaxToMailTechnicalException(t(errorMessage, file), e); } return tempDir; } Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/RessourceClassLoader.java 2014-02-06 08:35:48 UTC (rev 6) @@ -17,7 +17,7 @@ import java.util.Enumeration; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A class loader that search first in a given directory before in parent @@ -60,7 +60,7 @@ this.directories.add(directory); // force to create directory - FaxToMailIOUtil.forceMkdir(directory, _("faxtomail.persistence.mkDir.error", directory)); + FaxToMailIOUtil.forceMkdir(directory, t("faxtomail.persistence.mkDir.error", directory)); } } loader = null; @@ -158,7 +158,7 @@ directories.toArray(new File[directories.size()])); loader = URLClassLoader.newInstance(urls, null); } catch (IOException e) { - throw new FaxToMailTechnicalException(_("faxtomail.persistence.loader.error", directories), e); + throw new FaxToMailTechnicalException(t("faxtomail.persistence.loader.error", directories), e); } } return loader; Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfig.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfig.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfig.java 2014-02-06 08:35:48 UTC (rev 6) @@ -7,8 +7,6 @@ import java.io.File; import java.net.URL; -import static org.nuiton.i18n.I18n._; - /** * Configuration for the service layer. * Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfigOption.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfigOption.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfigOption.java 2014-02-06 08:35:48 UTC (rev 6) @@ -6,7 +6,7 @@ import java.io.File; import java.net.URL; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Option for service configuration. @@ -19,35 +19,35 @@ // TRANSIENT CONFIG VERSION( "faxtomail.version", - n_("faxtomail.config.option.version.description"), + n("faxtomail.config.option.version.description"), "", Version.class, true, true), SITE_URL( "faxtomail.site.url", - n_("faxtomail.config.option.site.url.description"), + n("faxtomail.config.option.site.url.description"), "http://maven-site.forge.codelutin.com/faxtomail", URL.class, true, true), ORGANIZATION_NAME( "faxtomail.organizationName", - n_("faxtomail.config.option.organizationName.description"), + n("faxtomail.config.option.organizationName.description"), "", String.class, true, true), INCEPTION_YEAR( "faxtomail.inceptionYear", - n_("faxtomail.config.option.inceptionYear.description"), + n("faxtomail.config.option.inceptionYear.description"), "2012", Integer.class, true, true), BASEDIR( "faxtomail.basedir", - n_("faxtomail.config.option.basedir.description"), + n("faxtomail.config.option.basedir.description"), "${user.home}/.faxtomail", File.class, true, @@ -55,14 +55,14 @@ ), DATA_DIRECTORY( "faxtomail.data.directory", - n_("faxtomail.config.option.data.directory.description"), + n("faxtomail.config.option.data.directory.description"), "${faxtomail.basedir}/data", File.class, true, true), TMP_DIRECTORY( "faxtomail.tmp.directory", - n_("faxtomail.config.option.tmp.directory.description"), + n("faxtomail.config.option.tmp.directory.description"), "${faxtomail.data.directory}/temp", File.class, true, @@ -72,7 +72,7 @@ CSV_SEPARATOR( "faxtomail.csv.separator", - n_("faxtomail.config.option.csv.separator.description"), + n("faxtomail.config.option.csv.separator.description"), ";", char.class); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfigProvider.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfigProvider.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/config/FaxToMailServiceConfigProvider.java 2014-02-06 08:35:48 UTC (rev 6) @@ -6,7 +6,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Service config provider (for site generation). @@ -23,7 +23,7 @@ @Override public String getDescription(Locale locale) { - return l_(locale, "faxtomail.config.service"); + return l(locale, "faxtomail.config.service"); } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-02-06 08:35:48 UTC (rev 6) @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * UI application context. Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/AbstractFaxToMailAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/AbstractFaxToMailAction.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/AbstractFaxToMailAction.java 2014-02-06 08:35:48 UTC (rev 6) @@ -16,7 +16,7 @@ import javax.swing.*; import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * FaxToMail base action. @@ -270,13 +270,13 @@ // file exists ask user to overwrite String htmlMessage = String.format( AbstractFaxToMailUIHandler.CONFIRMATION_FORMAT, - _("faxtomail.common.askOverwriteFile.message", file), - _("faxtomail.common.askOverwriteFile.help")); + t("faxtomail.common.askOverwriteFile.message", file), + t("faxtomail.common.askOverwriteFile.help")); result = JOptionPane.showConfirmDialog( getHandler().getTopestUI(), htmlMessage, - _("faxtomail.common.askOverwriteFile.title"), + t("faxtomail.common.askOverwriteFile.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION; } else { @@ -291,7 +291,7 @@ String htmlMessage = String.format( AbstractFaxToMailUIHandler.CONFIRMATION_FORMAT, message, - _("faxtomail.common.askBeforeDelete.help")); + t("faxtomail.common.askBeforeDelete.help")); int i = JOptionPane.showConfirmDialog( getHandler().getTopestUI(), htmlMessage, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/FaxToMailActionHelper.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/FaxToMailActionHelper.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/FaxToMailActionHelper.java 2014-02-06 08:35:48 UTC (rev 6) @@ -8,7 +8,7 @@ import javax.swing.*; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Useful method around FaxToMailUIAction. @@ -110,7 +110,7 @@ A result = ConstructorUtils.invokeConstructor(actionName, handler); return result; } catch (Exception e) { - throw new FaxToMailTechnicalException(_("faxtomail.action.create.error", actionName), e); + throw new FaxToMailTechnicalException(t("faxtomail.action.create.error", actionName), e); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/FaxToMailActionUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/FaxToMailActionUIHandler.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/action/FaxToMailActionUIHandler.java 2014-02-06 08:35:48 UTC (rev 6) @@ -18,7 +18,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit@codelutin.com> @@ -193,12 +193,12 @@ } protected void showAction(AbstractFaxToMailAction action) { - ui.setTitle(_("faxtomail.main.title.action", + ui.setTitle(t("faxtomail.main.title.action", // getConfig().getVersion(), "0.1", action.getActionDescription())); ui.getGlobalActionLabel().setText( - _("faxtomail.message.action.running", + t("faxtomail.message.action.running", action.getActionDescription())); ui.pack(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfig.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfig.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfig.java 2014-02-06 08:35:48 UTC (rev 6) @@ -21,7 +21,7 @@ import java.util.Locale; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * FaxToMail application config. @@ -82,7 +82,7 @@ applicationConfig.parse(args); } catch (ArgumentsParserException e) { - throw new FaxToMailTechnicalException(_("faxtomail.config.parse.error"), e); + throw new FaxToMailTechnicalException(t("faxtomail.config.parse.error"), e); } //TODO Review this, this is very dirty to do this... Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfigOption.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfigOption.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfigOption.java 2014-02-06 08:35:48 UTC (rev 6) @@ -7,7 +7,7 @@ import java.io.File; import java.util.Locale; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * All FaxToMail configuration options. @@ -19,7 +19,7 @@ FAXTOMAIL_LAUNCH_MODE( "faxtomail.launch.mode", - n_("faxtomail.config.option.launch.mode.description"), + n("faxtomail.config.option.launch.mode.description"), null, String.class, true, @@ -28,7 +28,7 @@ FAXTOMAIL_I18N_DIRECTORY( "faxtomail.i18n.directory", - n_("faxtomail.config.option.i18n.directory.description"), + n("faxtomail.config.option.i18n.directory.description"), "${faxtomail.basedir}/i18n", File.class, false, @@ -37,7 +37,7 @@ // FAXTOMAIL_HELP_DIRECTORY( // "faxtomail.help.directory", -// n_("faxtomail.config.option.help.directory.description"), +// n("faxtomail.config.option.help.directory.description"), // "${faxtomail.basedir}/help", // File.class, // false, @@ -46,7 +46,7 @@ START_ACTION_FILE( "faxtomail.startActionFile", - n_("faxtomail.config.option.startActionFile.description"), + n("faxtomail.config.option.startActionFile.description"), "${faxtomail.basedir}/faxtomail-start-action", File.class, true, @@ -54,41 +54,41 @@ ), FAXTOMAIL_I18N_LOCALE( "faxtomail.i18n.locale", - n_("faxtomail.config.option.i18n.locale.description"), + n("faxtomail.config.option.i18n.locale.description"), Locale.FRANCE.getCountry(), Locale.class ), UI_CONFIG_FILE( "faxtomail.ui.config.file", - n_("faxtomail.config.option.ui.config.file.description"), + n("faxtomail.config.option.ui.config.file.description"), "${faxtomail.data.directory}/faxtomailUI.xml", File.class ), AUTO_POPUP_NUMBER_EDITOR( "faxtomail.ui.autoPopupNumberEditor", - n_("faxtomail.config.option.ui.autoPopupNumberEditor.description"), + n("faxtomail.config.option.ui.autoPopupNumberEditor.description"), String.valueOf(false), Boolean.class ), SHOW_NUMBER_EDITOR_BUTTON( "faxtomail.ui.showNumberEditorButton", - n_("faxtomail.config.option.ui.showNumberEditorButton.description"), + n("faxtomail.config.option.ui.showNumberEditorButton.description"), String.valueOf(true), Boolean.class ), COLOR_ALTERNATE_ROW( "faxtomail.ui.color.alternateRow", - n_("faxtomail.config.option.ui.color.alternateRow.description"), + n("faxtomail.config.option.ui.color.alternateRow.description"), new Color(217, 217, 217).toString(), Color.class ), COLOR_SELECTED_ROW( "faxtomail.ui.color.selectedRow", - n_("faxtomail.config.option.ui.color.selectedRow.description"), + n("faxtomail.config.option.ui.color.selectedRow.description"), new Color(57,105,138).toString(), Color.class ), @@ -99,21 +99,21 @@ */ COLOR_BLOCKING_LAYER( "faxtomail.ui.color.blockingLayer", - n_("faxtomail.config.option.ui.color.blockingLayer.description"), + n("faxtomail.config.option.ui.color.blockingLayer.description"), new Color(200, 200, 200).toString(), Color.class ), SHORTCUT_CLOSE_POPUP( "faxtomail.ui.shortcut.closePopup", - n_("faxtomail.config.option.ui.shortcut.closePopup.description"), + n("faxtomail.config.option.ui.shortcut.closePopup.description"), "alt pressed F", KeyStroke.class ), DATE_FORMAT( "faxtomail.ui.dateFormat", - n_("faxtomail.config.option.ui.dateFormat.description"), + n("faxtomail.config.option.ui.dateFormat.description"), "dd/MM/yyyy", String.class ); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfigProvider.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfigProvider.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/config/FaxToMailApplicationConfigProvider.java 2014-02-06 08:35:48 UTC (rev 6) @@ -6,7 +6,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Application config provider (for site generation). @@ -23,7 +23,7 @@ @Override public String getDescription(Locale locale) { - return l_(locale, "faxtomail.config.application"); + return l(locale, "faxtomail.config.application"); } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/CloseApplicationAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/CloseApplicationAction.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/CloseApplicationAction.java 2014-02-06 08:35:48 UTC (rev 6) @@ -2,7 +2,7 @@ import com.franciaflex.faxtomail.ui.swing.RunFaxToMail; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To close FaxToMail Application. @@ -17,7 +17,7 @@ public CloseApplicationAction(MainUIHandler handler) { super(handler, false, null); setSkipCheckCurrentScreen(true); - setActionDescription(_("faxtomail.main.action.exit.tip")); + setActionDescription(t("faxtomail.main.action.exit.tip")); } public void setExitCode(int exitCode) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/GoToPreviousScreenAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/GoToPreviousScreenAction.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/GoToPreviousScreenAction.java 2014-02-06 08:35:48 UTC (rev 6) @@ -1,6 +1,6 @@ package com.franciaflex.faxtomail.ui.swing.content; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To return on previous screen. @@ -15,6 +15,6 @@ true, PREVIOUS_SCREEN.getContextValue(handler.getUI()) ); - setActionDescription(_("faxtomail.main.action.goto.previousScreen.tip")); + setActionDescription(t("faxtomail.main.action.goto.previousScreen.tip")); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUIHandler.java 2014-02-06 08:35:48 UTC (rev 6) @@ -30,7 +30,7 @@ import java.beans.PropertyChangeListenerProxy; import java.util.Locale; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit@codelutin.com> @@ -358,26 +358,26 @@ case CONFIG: screenUI = new FaxToMailConfigUI(ui); - screenTitle = _("faxtomail.config.title"); + screenTitle = t("faxtomail.config.title"); icon = ui.getMenuFileConfiguration().getIcon(); break; case SEARCH: screenUI = new SearchUI(ui); - screenTitle = _("faxtomail.search.title"); + screenTitle = t("faxtomail.search.title"); icon = ui.getMenuFileConfiguration().getIcon(); break; case DEMANDE: screenUI = new DemandeUI(ui); - screenTitle = _("faxtomail.demande.title"); + screenTitle = t("faxtomail.demande.title"); icon = ui.getMenuFileConfiguration().getIcon(); break; default: case LIST: screenUI = new DemandeListUI(ui); - screenTitle = _("faxtomail.demandeList.title"); + screenTitle = t("faxtomail.demandeList.title"); icon = ui.getMenuFileConfiguration().getIcon(); break; } @@ -409,7 +409,7 @@ String title = getSelectedCruiseTitle(); - ui.setTitle(_("faxtomail.main.title.application", + ui.setTitle(t("faxtomail.main.title.application", // getConfig().getVersion(), "0.1", title)); @@ -471,7 +471,7 @@ // no db loaded - title = _("faxtomail.main.title.nodb"); + title = t("faxtomail.main.title.nodb"); // } return title; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/ReloadFaxToMailAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/ReloadFaxToMailAction.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/ReloadFaxToMailAction.java 2014-02-06 08:35:48 UTC (rev 6) @@ -2,7 +2,7 @@ import com.franciaflex.faxtomail.ui.swing.RunFaxToMail; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To reload FaxToMail application. @@ -14,7 +14,7 @@ public ReloadFaxToMailAction(MainUIHandler handler) { super(handler, true, null); - setActionDescription(_("faxtomail.main.action.reloadFaxToMail")); + setActionDescription(t("faxtomail.main.action.reloadFaxToMail")); } @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/StartAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/StartAction.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/StartAction.java 2014-02-06 08:35:48 UTC (rev 6) @@ -7,8 +7,6 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; - /** * Start action (when the start action file is present when * starting application). Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-02-06 08:35:48 UTC (rev 6) @@ -44,7 +44,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of UI {@link com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler}. @@ -62,9 +62,9 @@ String result; if (exist) { - result = _("tutti.editCruise.title.edit.cruise"); + result = t("tutti.editCruise.title.edit.cruise"); } else { - result = _("tutti.editCruise.title.create.cruise"); + result = t("tutti.editCruise.title.create.cruise"); } return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java 2014-02-06 08:35:48 UTC (rev 6) @@ -34,7 +34,7 @@ import javax.swing.*; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of UI {@link DemandeUIHandler}. @@ -52,9 +52,9 @@ String result; if (exist) { - result = _("tutti.editCruise.title.edit.cruise"); + result = t("tutti.editCruise.title.edit.cruise"); } else { - result = _("tutti.editCruise.title.create.cruise"); + result = t("tutti.editCruise.title.create.cruise"); } return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-02-06 08:35:48 UTC (rev 6) @@ -47,7 +47,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of UI {@link SearchUIHandler}. @@ -65,9 +65,9 @@ String result; if (exist) { - result = _("tutti.editCruise.title.edit.cruise"); + result = t("tutti.editCruise.title.edit.cruise"); } else { - result = _("tutti.editCruise.title.create.cruise"); + result = t("tutti.editCruise.title.create.cruise"); } return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java 2014-02-06 08:35:48 UTC (rev 6) @@ -46,7 +46,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Contract of any UI handler. @@ -225,11 +225,11 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, message, - _("faxtomail.common.askSaveBeforeLeaving.help")); + t("faxtomail.common.askSaveBeforeLeaving.help")); int result = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("faxtomail.common.askSaveBeforeLeaving.title"), + t("faxtomail.common.askSaveBeforeLeaving.title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); return result; @@ -239,11 +239,11 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, message, - _("faxtomail.common.askCancelEditBeforeLeaving.help")); + t("faxtomail.common.askCancelEditBeforeLeaving.help")); int i = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("faxtomail.common.askCancelEditBeforeLeaving.title"), + t("faxtomail.common.askCancelEditBeforeLeaving.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -680,7 +680,7 @@ } // String dateFormat = getConfig().getDateFormat(); picker.setFormats("dd/MM/yyyy"); - picker.setToolTipText(_("faxtomail.common.datefield.tip", "dd/MM/yyyy")); + picker.setToolTipText(t("faxtomail.common.datefield.tip", "dd/MM/yyyy")); picker.getEditor().addFocusListener(new FocusAdapter() { @Override Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailErrorHelper.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailErrorHelper.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailErrorHelper.java 2014-02-06 08:35:48 UTC (rev 6) @@ -8,7 +8,7 @@ import javax.swing.*; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * helper around errors in FaxToMail. @@ -34,7 +34,7 @@ if (cause == null) { JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + message + "</body></html>", - _("faxtomail.error.ui.business.error"), + t("faxtomail.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); // } else if (cause instanceof FaxToMailBusinessException) { // JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + cause.getMessage() + "</body></html>", @@ -42,13 +42,13 @@ // JOptionPane.ERROR_MESSAGE); } else if (cause instanceof ImportRuntimeException) { JOptionPane.showMessageDialog(context.getMainUI(), cause.getMessage(), - _("faxtomail.error.ui.business.error"), + t("faxtomail.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); } else { JXErrorPane pane = new JXErrorPane(); - ErrorInfo info = new ErrorInfo(_("faxtomail.error.ui.other.error"), - _("faxtomail.error.errorpane.htmlmessage", message), null, null, + ErrorInfo info = new ErrorInfo(t("faxtomail.error.ui.other.error"), + t("faxtomail.error.errorpane.htmlmessage", message), null, null, cause, null, null); pane.setErrorInfo(info); pane.setErrorReporter(this); @@ -80,7 +80,7 @@ public void showWarningDialog(String message) { JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + message + "</body></html>", - _("faxtomail.error.ui.business.warning"), + t("faxtomail.error.ui.business.warning"), JOptionPane.WARNING_MESSAGE); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-02-05 18:56:18 UTC (rev 5) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-02-06 08:35:48 UTC (rev 6) @@ -42,7 +42,7 @@ import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit@codelutin.com> @@ -63,7 +63,7 @@ try { PropertyUtils.setSimpleProperty(bean, property, value); } catch (Exception e) { - throw new FaxToMailTechnicalException(_("faxtomail.property.set.error", property, bean.getClass().getName()), e); + throw new FaxToMailTechnicalException(t("faxtomail.property.set.error", property, bean.getClass().getName()), e); } } @@ -73,7 +73,7 @@ try { return PropertyUtils.getSimpleProperty(bean, property); } catch (Exception e) { - throw new FaxToMailTechnicalException(_("faxtomail.property.get.error", property, bean.getClass().getName()), e); + throw new FaxToMailTechnicalException(t("faxtomail.property.get.error", property, bean.getClass().getName()), e); } } @@ -105,7 +105,7 @@ try { openLink(url.toURI()); } catch (URISyntaxException e) { - throw new FaxToMailTechnicalException(_("swing.error.cannot.open.link", url), e); + throw new FaxToMailTechnicalException(t("swing.error.cannot.open.link", url), e); } } @@ -113,7 +113,7 @@ if (!Desktop.isDesktopSupported()) { throw new FaxToMailTechnicalException( - _("swing.error.desktop.not.supported")); + t("swing.error.desktop.not.supported")); } Desktop desktop = Desktop.getDesktop(); @@ -121,7 +121,7 @@ if (!desktop.isSupported(Desktop.Action.BROWSE)) { throw new FaxToMailTechnicalException( - _("swing.error.desktop.browse.not.supported")); + t("swing.error.desktop.browse.not.supported")); } return desktop; @@ -137,7 +137,7 @@ } catch (Exception e) { throw new FaxToMailTechnicalException( - _("swing.error.cannot.open.link", uri), e); + t("swing.error.cannot.open.link", uri), e); } } @@ -145,7 +145,7 @@ if (!Desktop.isDesktopSupported()) { throw new FaxToMailTechnicalException( - _("swing.error.desktop.not.supported")); + t("swing.error.desktop.not.supported")); } Desktop desktop = Desktop.getDesktop(); @@ -153,7 +153,7 @@ if (!desktop.isSupported(Desktop.Action.MAIL)) { throw new FaxToMailTechnicalException( - _("swing.error.desktop.mail.not.supported")); + t("swing.error.desktop.mail.not.supported")); } return desktop; @@ -170,7 +170,7 @@ } catch (Exception e) { throw new FaxToMailTechnicalException( - _("swing.error.cannot.mail"), e); + t("swing.error.cannot.mail"), e); } }