[I18n-commits] r2025 - in trunk/nuiton-i18n-editor: . src/main/java/org/nuiton/i18n/editor src/main/java/org/nuiton/i18n/editor/project src/main/java/org/nuiton/i18n/editor/project/impl src/main/java/org/nuiton/i18n/editor/ui src/main/java/org/nuiton/i18n/editor/ui/project src/main/java/org/nuiton/i18n/editor/ui/project/tabs src/site

Author: tchemit Date: 2014-02-04 09:16:15 +0100 (Tue, 04 Feb 2014) New Revision: 2025 Url: http://nuiton.org/projects/i18n/repository/revisions/2025 Log: fix nuiton-i18n-editor build Modified: trunk/nuiton-i18n-editor/pom.xml trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PropertiesTreeModel.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectStep.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.css trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx trunk/nuiton-i18n-editor/src/site/site_fr.xml Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/pom.xml 2014-02-04 08:16:15 UTC (rev 2025) @@ -52,6 +52,12 @@ <version>${nuitonUtilsVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>3.0-SNAPSHOT</version> + </dependency> + <!--Jaxx--> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -65,6 +71,12 @@ <version>${jaxxVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-config</artifactId> + <version>${jaxxVersion}</version> + </dependency> + </dependencies> <!-- ************************************************************* --> @@ -93,8 +105,8 @@ <!-- main class in jar --> <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> - <jaxxVersion>2.5.5</jaxxVersion> - <nuitonUtilsVersion>1.2</nuitonUtilsVersion> + <jaxxVersion>2.8-SNAPSHOT</jaxxVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <!-- default license to use --> <license.licenseName>gpl_v3</license.licenseName> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -34,7 +34,7 @@ import java.util.Date; import java.util.Locale; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * L'application. @@ -65,7 +65,7 @@ I18nEditorContext context = init(args); - log.info(_("i18neditor.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); + log.info(t("i18neditor.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); JAXXUtil.checkJAXXContextEntry(context, JAXXUtil.newContextEntryDef(I18nEditorConfig.class)); @@ -81,7 +81,7 @@ final I18nEditorUI ui = uiHandler.initUI(context, config.isFullScreen()); - log.info(_("i18neditor.init.ui.done")); + log.info(t("i18neditor.init.ui.done")); SwingUtilities.invokeLater(new Runnable() { @@ -122,7 +122,7 @@ // force to kill main thread - log.info(_("i18neditor.init.closed", new Date())); + log.info(t("i18neditor.init.closed", new Date())); Runtime.getRuntime().halt(0); } catch (Exception ex) { log.error("error while closing " + ex.getMessage(), ex); @@ -141,16 +141,16 @@ // init i18n I18n.init(new DefaultI18nInitializer("nuiton-i18n-editor-i18n"), config.getLocale()); - log.info(_("i18neditor.message.config.loaded", config.getVersion())); + log.info(t("i18neditor.message.config.loaded", config.getVersion())); // prepare ui look&feel and load ui properties try { SwingUtil.initNimbusLoookAndFeel(); } catch (Exception e) { // could not find nimbus look-and-feel - log.warn(_("i18neditor.warning.nimbus.landf")); + log.warn(t("i18neditor.warning.nimbus.landf")); } catch (Throwable e) { - log.warn(_("i18neditor.warning.no.ui"), e); + log.warn(t("i18neditor.warning.no.ui"), e); // pas d'environnement d'ui config.setCanUseUI(false); } @@ -169,7 +169,7 @@ public void help() { I18nEditorContext context = I18nEditorContext.get(); I18nEditorConfig config = context.getConfig(); - System.out.println(I18n._("i18neditor.message.help.usage", config.getVersion())); + System.out.println(I18n.t("i18neditor.message.help.usage", config.getVersion())); System.out.println("Options (set with --option <key> <value>:"); for (I18nEditorConfig.Option o : I18nEditorConfig.Option.values()) { System.out.println("\t" + o.key + "(" + o.defaultValue + "):" + o.description); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -23,12 +23,13 @@ import jaxx.runtime.JAXXUtil; import jaxx.runtime.context.DefaultApplicationContext; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.FileUtil; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ConfigOptionDef; import org.nuiton.util.Version; import java.beans.PropertyChangeListener; @@ -134,7 +135,13 @@ //FileUtil.setCurrentDirectory(getUserDirectory()); getUserDirectory().mkdirs(); // suppression du contenu du répertoire temporaire - FileUtil.deleteRecursively(getTmpDirectory()); + try { + FileUtils.cleanDirectory(getTmpDirectory()); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Could not clean temporary directory",e); + } + } // initialisation des actions for (Action a : Action.values()) { @@ -266,15 +273,15 @@ ////////////////////////////////////////////////// // Toutes les options disponibles ////////////////////////////////////////////////// - public enum Option implements OptionDef { + public enum Option implements ConfigOptionDef { - CONFIG_FILE(CONFIG_FILE_NAME, _("i18neditor.config.configFileName.description"), "nuitoni18neditor-config", String.class, true, true), + CONFIG_FILE(CONFIG_FILE_NAME, t("i18neditor.config.configFileName.description"), "nuitoni18neditor-config", String.class, true, true), // directories - TMP_DIRECTORY("tmp.directory", _("i18neditor.config.defaultTmpDirectory.description"), getUserDirectory() + File.separator + "tmp", File.class, false, false), - PROJECTS_DIRECTORY("projects.directory", _("i18neditor.config.defaultProjectsDirectory.description"), getUserDirectory() + File.separator + "projects", File.class, false, false), + TMP_DIRECTORY("tmp.directory", t("i18neditor.config.defaultTmpDirectory.description"), getUserDirectory() + File.separator + "tmp", File.class, false, false), + PROJECTS_DIRECTORY("projects.directory", t("i18neditor.config.defaultProjectsDirectory.description"), getUserDirectory() + File.separator + "projects", File.class, false, false), // ui config - FULL_SCREEN("ui.fullscreen", _("i18neditor.config.ui.fullscreen"), "false", Boolean.class, false, false), - LOCALE("ui.locale", _("i18neditor.config.ui.locale"), Locale.FRANCE.toString(), Locale.class, false, false); + FULL_SCREEN("ui.fullscreen", t("i18neditor.config.ui.fullscreen"), "false", Boolean.class, false, false), + LOCALE("ui.locale", t("i18neditor.config.ui.locale"), Locale.FRANCE.toString(), Locale.class, false, false); public final String key; public final String description; public final String defaultValue; @@ -297,6 +304,21 @@ } @Override + public void setDefaultValue(String defaultValue) { + + } + + @Override + public void setTransient(boolean isTransient) { + + } + + @Override + public void setFinal(boolean isFinal) { + + } + + @Override public boolean isTransient() { return _transient; } @@ -320,6 +342,8 @@ public Class<?> getType() { return type; } + + } public enum Step { @@ -329,9 +353,9 @@ public enum Action { - HELP(_("i18neditor.action.commandline.help"), I18nEditor.class.getName() + "#help", "-h", "--help"), - CONFIGURE(_("i18neditor.action.commandline.configure"), I18nEditor.class.getName() + "#configure", "-c", "--configure"), - NO_MAIN_UI(_("i18neditor.action.commandline.disable.main.ui"), I18nEditor.class.getName() + "#disableMainUI", "-n", "--no-main"); + HELP(t("i18neditor.action.commandline.help"), I18nEditor.class.getName() + "#help", "-h", "--help"), + CONFIGURE(t("i18neditor.action.commandline.configure"), I18nEditor.class.getName() + "#configure", "-c", "--configure"), + NO_MAIN_UI(t("i18neditor.action.commandline.disable.main.ui"), I18nEditor.class.getName() + "#disableMainUI", "-n", "--no-main"); public String description; public String action; public String[] aliases; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -62,7 +62,7 @@ @Override public String getDescription() { - return I18n._(description); + return I18n.t(description); } @Override Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -57,8 +57,8 @@ public void chooseDirectorySource() { File f = model.chooseDirectory( this, - _("i18neditor.title.choose.directory.source"), - _("i18neditor.action.choose.directory.source.description"), + t("i18neditor.title.choose.directory.source"), + t("i18neditor.action.choose.directory.source.description"), getProject().getDirectorySource()); getProject().setDirectorySource(f); } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -29,7 +29,7 @@ import java.util.TreeMap; import org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI; import org.nuiton.i18n.editor.ui.project.ProjectUIModel; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import static org.nuiton.i18n.I18n.*; @@ -41,8 +41,8 @@ public DirectoryI18nProjectProvider() { super(DirectoryI18nProject.class, - n_("i18neditor.project.type.directory"), - n_("i18neditor.project.type.directory.description") + n("i18neditor.project.type.directory"), + n("i18neditor.project.type.directory.description") ); } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -58,11 +58,11 @@ public void chooseJarSource() { File f = model.chooseFile ( this, - _("i18neditor.title.choose.jar.source"), - _("i18neditor.action.choose.jar.source"), + t("i18neditor.title.choose.jar.source"), + t("i18neditor.action.choose.jar.source"), getProject().getJarSource(), "^.+\\.jar$", - _("i18neditor.action.choose.jar.source.description")); + t("i18neditor.action.choose.jar.source.description")); getProject().setJarSource(f); } ]]> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -25,7 +25,7 @@ import org.nuiton.i18n.editor.project.AbstractI18nProjectProvider; import org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI; import org.nuiton.i18n.editor.ui.project.ProjectUIModel; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import org.nuiton.util.Resource; import java.io.File; @@ -49,8 +49,8 @@ public JarI18nProjectProvider() { super(JarI18nProject.class, - I18n.n_("i18neditor.project.type.jar"), - I18n.n_("i18neditor.project.type.jar.description")); + I18n.n("i18neditor.project.type.jar"), + I18n.n("i18neditor.project.type.jar.description")); } @Override Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -21,14 +21,14 @@ --> -<JCheckBoxMenuItem id='content' text='{getBundle().getDisplayName()}' toolTipText='{_("i18neditor.bundle.name", getBundle().getDisplayName())}' onItemStateChanged='updateState(event)'> +<JCheckBoxMenuItem id='content' text='{getBundle().getDisplayName()}' toolTipText='{t("i18neditor.bundle.name", getBundle().getDisplayName())}' onItemStateChanged='updateState(event)'> <import> org.nuiton.i18n.editor.I18nEditorContext java.util.Locale jaxx.runtime.JAXXContext -static t +static org.nuiton.i18n.I18n.t </import> <!-- le nom du bundle --> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -29,7 +29,7 @@ org.nuiton.i18n.editor.I18nEditorContext -static t +static org.nuiton.i18n.I18n.t </import> <!-- la locale --> @@ -62,7 +62,7 @@ protected String updateLabel(Locale l) { String result = null; if (l != null) { - result = _("i18neditor.bundle.name", l.getDisplayName()); + result = t("i18neditor.bundle.name", l.getDisplayName()); } return result; } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -35,7 +35,7 @@ org.nuiton.i18n.editor.project.I18nProject org.nuiton.i18n.editor.project.AbstractI18nProject -static t +static org.nuiton.i18n.I18n.t </import> <!-- les locales --> @@ -55,7 +55,7 @@ if (index > -1) { l = l.substring(index + 1); } - result = _("i18neditor.package.name", l); + result = t("i18neditor.package.name", l); } return result; } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -29,7 +29,7 @@ org.nuiton.i18n.editor.I18nEditorContext -static t +static org.nuiton.i18n.I18n.t </import> <String id='bundle'/> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -29,7 +29,7 @@ org.nuiton.i18n.editor.I18nEditorContext -static t +static org.nuiton.i18n.I18n.t </import> <String id='bundle'/> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -46,7 +46,7 @@ javax.swing.tree.TreeNode java.awt.Component -static t +static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ @@ -111,9 +111,9 @@ public String updateTitle(I18nProject p) { String txt = null; if (p==null) { - txt = _("i18neditor.title.noproject"); + txt = t("i18neditor.title.noproject"); } else { - txt = _("i18neditor.title", p.getName() + " - " + p.getStoreFile()); + txt = t("i18neditor.title", p.getName() + " - " + p.getStoreFile()); } return txt; } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -21,10 +21,9 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.context.DefaultApplicationContext.AutoLoad; import jaxx.runtime.swing.AboutPanel; -import jaxx.runtime.swing.editor.config.ConfigUI; -import jaxx.runtime.swing.editor.config.ConfigUIHelper; -import jaxx.runtime.swing.editor.config.model.ConfigUIModel; -import jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder; +import jaxx.runtime.swing.config.ConfigUIHelper; +import jaxx.runtime.swing.config.model.ConfigUIModel; +import jaxx.runtime.swing.config.model.ConfigUIModelBuilder; import jaxx.runtime.swing.wizard.WizardUILancher; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,8 +62,8 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.editor.I18nEditorConfig.Option; /** @author tchemit <chemit@codelutin.com> */ @@ -171,11 +170,11 @@ try { File f = ProjectUIModel.chooseFile(getUI(context), - _("i18neditor.title.choose.project"), - _("i18neditor.action.choose.project"), + t("i18neditor.title.choose.project"), + t("i18neditor.action.choose.project"), null, "^.+\\.i18nproject$", - _("i18neditor.action.choose.project.description")); + t("i18neditor.action.choose.project.description")); if (f == null) { return; } @@ -494,7 +493,7 @@ // builder.registerCallBack( // "application", -// n_("i18neditor.action.reload.application"), +// n("i18neditor.action.reload.application"), // UIHelper.createActionIcon("reload-application"), // reloadApplicationCallback // ); @@ -504,30 +503,30 @@ builder.addOption(Option.TMP_DIRECTORY); // // model.addCategory( -// n_("i18neditor.config.category.directories"), -// n_("i18neditor.config.category.directories.description"), +// n("i18neditor.config.category.directories"), +// n("i18neditor.config.category.directories.description"), // Option.CONFIG_FILE, // Option.PROJECTS_DIRECTORY, // Option.TMP_DIRECTORY); builder.addCategory( - n_("i18neditor.config.category.ui"), - n_("i18neditor.config.category.ui.description") + n("i18neditor.config.category.ui"), + n("i18neditor.config.category.ui.description") ); builder.addOption(Option.FULL_SCREEN); builder.addOption(Option.LOCALE); // // model.addCategory( -// n_("i18neditor.config.category.ui"), -// n_("i18neditor.config.category.ui.description"), +// n("i18neditor.config.category.ui"), +// n("i18neditor.config.category.ui.description"), // Option.FULL_SCREEN, // Option.LOCALE); ConfigUIModel model = builder.flushModel(); ConfigUIHelper configUIHelper = new ConfigUIHelper(context.getConfig()); - ConfigUI configUI = configUIHelper.buildUI(ui, "default"); +// ConfigUI configUI = configUIHelper.buildUI(ui, "default"); // context, model, "i18neditor.config.category.ui"); configUIHelper.displayUI(ui, false); @@ -596,8 +595,8 @@ I18nEditorUI ui = getUI(context); AboutPanel about = new AboutPanel(ui); - about.setTitle(_("i18neditor.title.about")); - about.setAboutText(_("i18neditor.about.message")); + about.setTitle(t("i18neditor.title.about")); + about.setAboutText(t("i18neditor.about.message")); about.setBottomText(context.getConfig().getCopyrightText()); // about.setIconPath("/icons/logo-OT_web.png"); about.setLicenseFile("META-INF/nuiton-i18n-editor-LICENSE.txt"); @@ -610,16 +609,16 @@ I18nEditorUI ui = getUI(context); - String text = null; + String text; if (context.getProject() == null) { - text = _("i18neditor.message.no.project.loaded"); + text = t("i18neditor.message.no.project.loaded"); } else { text = context.getProject().toString(); } JOptionPane.showMessageDialog( ui, text, - _("i18neditor.title.project.info"), + t("i18neditor.title.project.info"), JOptionPane.INFORMATION_MESSAGE); } @@ -731,7 +730,7 @@ for (String p : projects) { box.addItem(p); } - JOptionPane.showMessageDialog(getUI(context), box, _("i18neditor.choose.project.to.delete"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(getUI(context), box, t("i18neditor.choose.project.to.delete"), JOptionPane.INFORMATION_MESSAGE); String selectedProject = (String) box.getSelectedItem(); if (!selectedProject.isEmpty()) { Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -23,7 +23,7 @@ <JCheckBoxMenuItem id='content' text='{updateText(getUrl())}' - toolTipText='{_("i18neditor.resource.name", getUrl())}' + toolTipText='{t("i18neditor.resource.name", getUrl())}' onItemStateChanged='updateState(event)'> <import> @@ -31,7 +31,7 @@ java.util.Locale jaxx.runtime.JAXXContext -static t +static org.nuiton.i18n.I18n.t </import> <!-- le nom du bundle --> Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PropertiesTreeModel.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PropertiesTreeModel.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PropertiesTreeModel.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -22,7 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.editor.I18nEditorContext; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Modèle de l'arbre des propriétés. Le modèle permet de sructurer les propriétés @@ -60,7 +60,7 @@ // Création de la racine (qui n'est jamais affichee) PropertieNode r = new PropertieNode(""); -// PropertieNode r = new PropertieNode(list.length == 0 ? _("i18neditor.no.keys") : I18nEditorContext.ROOT_NAME); +// PropertieNode r = new PropertieNode(list.length == 0 ? t("i18neditor.no.keys") : I18nEditorContext.ROOT_NAME); setRoot(r); setMode(mode); } @@ -144,7 +144,7 @@ } if (keys == null || keys.length == 0) { // pas de clef a reconstruire - PropertieNode r2 = new PropertieNode(_("i18neditor.no.keys")); + PropertieNode r2 = new PropertieNode(t("i18neditor.no.keys")); r.add(r2); // on notifie que le modele a ete reconstruit nodeStructureChanged(root); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectStep.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectStep.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectStep.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -20,7 +20,7 @@ import jaxx.runtime.swing.wizard.WizardStep; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Pour caracteriser les étapes lors du wizard de creation de projet @@ -31,22 +31,22 @@ /** pour choisir le type de projet a creer (@see ProjectType) */ CHOOSE_PROJECT_TYPE( - n_("i18neditor.project.step.chooseProjectType"), - n_("i18neditor.project.step.chooseProjectType.description")), + n("i18neditor.project.step.chooseProjectType"), + n("i18neditor.project.step.chooseProjectType.description")), /** pour configurer un projet */ CONFIGURE_PROJECT( - n_("i18neditor.project.step.configureProject"), - n_("i18neditor.project.step.configureProject.description")), + n("i18neditor.project.step.configureProject"), + n("i18neditor.project.step.configureProject.description")), /** pour choisir les bundles parmis ceux trouvés */ SELECT_BUNDLES( - n_("i18neditor.project.step.selecteBundles"), - n_("i18neditor.project.step.selecteBundles.description")), + n("i18neditor.project.step.selecteBundles"), + n("i18neditor.project.step.selecteBundles.description")), /** pour renseigner si on persiste le projet */ - PERSIST(n_("i18neditor.project.step.persist"), - n_("i18neditor.project.step.persist.description")), + PERSIST(n("i18neditor.project.step.persist"), + n("i18neditor.project.step.persist.description")), /** pour confirmer et charger le projet */ - RESUME(n_("i18neditor.project.step.resume"), - n_("i18neditor.project.step.resume.description")); + RESUME(n("i18neditor.project.step.resume"), + n("i18neditor.project.step.resume.description")); private final String label; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -55,8 +55,8 @@ java.awt.event.MouseAdapter java.awt.event.MouseEvent -static n -static t +static org.nuiton.i18n.I18n.n +static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ @@ -220,10 +220,10 @@ SwingUtil.fixTableColumnWidth(table, 0, 20); SwingUtil.setI18nTableHeaderRenderer(table, - n_("i18neditor.createProject.table.bundles.select"), - n_("i18neditor.createProject.table.bundles.select.tip"), - n_("i18neditor.createProject.table.bundles.url"), - n_("i18neditor.createProject.table.bundles.url.tip")); + n("i18neditor.createProject.table.bundles.select"), + n("i18neditor.createProject.table.bundles.select.tip"), + n("i18neditor.createProject.table.bundles.url"), + n("i18neditor.createProject.table.bundles.url.tip")); DefaultTableCellRenderer renderer = new DefaultTableCellRenderer(); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java 2014-02-04 08:16:15 UTC (rev 2025) @@ -36,8 +36,8 @@ private static final long serialVersionUID = 1L; protected static final String[] COLUMN_NAMES = { - I18n.n_("i18neditor.createproject.common.select"), - I18n.n_("i18neditor.createproject.url") + I18n.n("i18neditor.createproject.common.select"), + I18n.n("i18neditor.createproject.url") }; protected static final Class<?>[] COLUMN_CLASSES = { Boolean.class, Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.css =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.css 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.css 2014-02-04 08:16:15 UTC (rev 2025) @@ -31,7 +31,7 @@ } #descriptionPane { - columnHeaderView:{new JLabel(_("i18neditor.common.descrition"), SwingUtil.getUIManagerActionIcon("information"), 10)}; + columnHeaderView:{new JLabel(t("i18neditor.common.descrition"), SwingUtil.getUIManagerActionIcon("information"), 10)}; } #description { Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -35,8 +35,8 @@ javax.swing.JLabel java.awt.Color -static n -static t +static org.nuiton.i18n.I18n.n +static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ @@ -63,8 +63,8 @@ ProjectStep step = getStep(); String txt = ""; if (step != null) { - txt = n_("i18neditor.project.step.label"); - txt = _(txt, currentStep + 1, nbStep, _(step.getLabel())); + txt = n("i18neditor.project.step.label"); + txt = t(txt, currentStep + 1, nbStep, t(step.getLabel())); } return txt; } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -39,7 +39,7 @@ java.awt.GridBagConstraints java.awt.Insets -static t +static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ @@ -54,8 +54,8 @@ b.setName(name); b.putClientProperty("$buttonGroup", mode); mode.add(b); - b.setText(_(p.getLabel())); - b.setToolTipText(_(p.getDescription())); + b.setText(t(p.getLabel())); + b.setToolTipText(t(p.getDescription())); b.putClientProperty("$value", p); mode.updateSelectedValue(); content.add(b, new GridBagConstraints(0, index++, 1, 1, 1.0, 0.0, 10, 1, new Insets(3, 3, 3, 3), 0, 0)); @@ -70,7 +70,7 @@ log.info("new project type : " + newMode); AbstractButton c = mode.getButton(newMode); c.setSelected(true); - setDescriptionText(_(newMode.getDescription())); + setDescriptionText(t(newMode.getDescription())); } } }); Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -32,7 +32,7 @@ org.nuiton.i18n.editor.project.I18nProjectFactory org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI -static t +static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ @@ -46,7 +46,7 @@ void $afterCompleteSetup() { if (getStep()!=null) { - setDescriptionText(_(getStep().getDescription())); + setDescriptionText(t(getStep().getDescription())); } for (I18nProjectProvider<?> p : I18nProjectFactory.getProviders()) { try { Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -37,7 +37,7 @@ java.io.File -static t +static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ @@ -61,8 +61,8 @@ public void chooseProjectDirectory() { File f = model.chooseDirectory ( this, - _("i18neditor.title.choose.projectDir"), - _("i18neditor.action.choose.projectDir"), + t("i18neditor.title.choose.projectDir"), + t("i18neditor.action.choose.projectDir"), new File(directoryText.getText())); changeDirectory(f); } @@ -77,7 +77,7 @@ void $afterCompleteSetup() { if (getStep()!=null) { - setDescriptionText(_(getStep().getDescription())); + setDescriptionText(t(getStep().getDescription())); } model.addPropertyChangeListener(ProjectUIModel.PROJECT_PROPERTY_NAME, new PropertyChangeListener() { Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -31,14 +31,14 @@ javax.swing.JLabel -static t +static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ void $afterCompleteSetup() { if (getStep()!=null) { - setDescriptionText(_(getStep().getDescription())); + setDescriptionText(t(getStep().getDescription())); } } @@ -51,7 +51,7 @@ <JPanel id='content' constraints='BorderLayout.CENTER' layout='{new BorderLayout()}'> - <JScrollPane columnHeaderView='{new JLabel(_("i18neditor.common.resume"))}' + <JScrollPane columnHeaderView='{new JLabel(t("i18neditor.common.resume"))}' constraints='BorderLayout.CENTER'> <JTextArea id='resume' text='{computeReport(model, model.getStep())}' Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx 2014-02-04 08:16:15 UTC (rev 2025) @@ -31,7 +31,7 @@ org.nuiton.i18n.editor.ui.project.ProjectStep org.nuiton.i18n.editor.ui.project.SelectBundlesTableModel -static t +static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ @@ -39,7 +39,7 @@ void $afterCompleteSetup() { if (getStep() != null) { - setDescriptionText(_(getStep().getDescription())); + setDescriptionText(t(getStep().getDescription())); } } ]]> Modified: trunk/nuiton-i18n-editor/src/site/site_fr.xml =================================================================== --- trunk/nuiton-i18n-editor/src/site/site_fr.xml 2014-02-04 06:25:25 UTC (rev 2024) +++ trunk/nuiton-i18n-editor/src/site/site_fr.xml 2014-02-04 08:16:15 UTC (rev 2025) @@ -18,7 +18,7 @@ </bannerRight> <poweredBy> - <logo href="http://maven-site.nuiton.org/jaxx" name="JAXX" img="images/jaxx-logo.png"/> + <logo href="${mavenpomSiteCommonResourcesUrl}/jaxx" name="JAXX" img="images/jaxx-logo.png"/> <logo href="http://jrst.labs.libre-entreprise.org/jrst" name="JRst" img="images/jrst-logo.png"/>