r1706 - 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
Author: tchemit Date: 2010-03-07 17:58:44 +0100 (Sun, 07 Mar 2010) New Revision: 1706 Log: use las version of i18n, jaxx and nuiton-utils + make it works (new api of i18n and jaxx) 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/I18nEditorContext.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.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/I18nProjectFactory.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java 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/JarI18nProject.java 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/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/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/ProjectUIModel.java 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/ChooseProjectTypePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/pom.xml 2010-03-07 16:58:44 UTC (rev 1706) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> @@ -73,8 +73,8 @@ <!-- main class in jar --> <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> - <jaxx.version>2.0.0-SNAPSHOT</jaxx.version> - <lutinutil.version>1.1.2-SNAPSHOT</lutinutil.version> + <jaxx.version>2.0.0-beta-6</jaxx.version> + <lutinutil.version>1.2-SNAPSHOT</lutinutil.version> <!-- 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -18,13 +18,15 @@ */ package org.nuiton.i18n.editor; +import jaxx.runtime.JAXXUtil; import org.nuiton.i18n.editor.ui.I18nEditorUIHandler; import org.nuiton.i18n.I18n; import java.io.IOException; +import java.util.Arrays; +import java.util.Date; import javax.swing.SwingUtilities; import jaxx.runtime.SwingUtil; -import jaxx.runtime.Util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.editor.ui.I18nEditorUI; @@ -47,12 +49,12 @@ * Lancement de l'interface * * @param args path to manage - * @throws java.io.IOException if any IO exception + * @throws IOException if any IO exception */ public static void main(String[] args) throws IOException { startingTime = System.nanoTime(); - log.info("I18nEditor start at " + new java.util.Date() + " args: " + java.util.Arrays.toString(args)); + log.info("I18nEditor start at " + new Date() + " args: " + Arrays.toString(args)); try { @@ -60,7 +62,7 @@ log.info(_("i18neditor.init.context.done", StringUtil.convertTime(startingTime, System.nanoTime()))); - Util.checkJAXXContextEntry(context, Util.newContextEntryDef(I18nEditorConfig.class)); + JAXXUtil.checkJAXXContextEntry(context, JAXXUtil.newContextEntryDef(I18nEditorConfig.class)); I18nEditorConfig config = context.getContextValue(I18nEditorConfig.class); @@ -115,7 +117,7 @@ // force to kill main thread - log.info(_("i18neditor.init.closed", new java.util.Date())); + log.info(_("i18neditor.init.closed", new Date())); Runtime.getRuntime().halt(0); } catch (Exception ex) { log.error("error while closing " + ex.getMessage(), ex); @@ -154,7 +156,7 @@ } if (log.isDebugEnabled()) { - log.debug("init done in " + (StringUtil.convertTime(t0, System.nanoTime()))); + log.debug("init done in " + StringUtil.convertTime(t0, System.nanoTime())); } return context; } @@ -170,7 +172,7 @@ System.out.println("Actions:"); for (I18nEditorConfig.Action a : I18nEditorConfig.Action.values()) { - System.out.println("\t" + java.util.Arrays.toString(a.aliases) + "(" + a.action + "):" + a.description); + System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + "):" + a.description); } disableMainUI(); } 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -20,9 +20,14 @@ import java.io.IOException; import java.io.InputStream; + +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.context.DefaultApplicationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n._; + +import org.nuiton.util.ApplicationConfig; import org.nuiton.util.FileUtil; import org.nuiton.util.Version; @@ -44,10 +49,10 @@ * et quel est son type (local ou pas). * * @author chemit - * @see jaxx.runtime.context.DefaultApplicationContext.AutoLoad + * @see DefaultApplicationContext.AutoLoad */ -@jaxx.runtime.context.DefaultApplicationContext.AutoLoad -public class I18nEditorConfig extends org.nuiton.util.ApplicationConfig { +@DefaultApplicationContext.AutoLoad +public class I18nEditorConfig extends ApplicationConfig { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(I18nEditorConfig.class); @@ -238,7 +243,7 @@ }; public void removeJaxxPropertyChangeListener() { - PropertyChangeListener[] toRemove = jaxx.runtime.Util.findJaxxPropertyChangeListener(DEFAULT_JAXX_PCS, getPropertyChangeListeners()); + PropertyChangeListener[] toRemove = JAXXUtil.findJaxxPropertyChangeListener(DEFAULT_JAXX_PCS, getPropertyChangeListeners()); if (toRemove == null || toRemove.length == 0) { return; } @@ -261,7 +266,7 @@ ////////////////////////////////////////////////// // Toutes les options disponibles ////////////////////////////////////////////////// - public static enum Option implements OptionDef { + public enum Option implements OptionDef { CONFIG_FILE(CONFIG_FILE_NAME, _("i18neditor.config.configFileName.description"), "nuitoni18neditor-config", String.class, true, true), // directories @@ -277,7 +282,7 @@ public final boolean _transient; public final boolean _final; - private Option(String key, String description, String defaultValue, Class<?> type, boolean _transient, boolean _final) { + Option(String key, String description, String defaultValue, Class<?> type, boolean _transient, boolean _final) { this.key = key; this.description = description; this.defaultValue = defaultValue; @@ -317,12 +322,12 @@ } } - public static enum Step { + public enum Step { AfterInit, BeforeExit } - public static enum Action { + 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"), @@ -331,7 +336,7 @@ public String action; public String[] aliases; - private Action(String description, String action, String... aliases) { + Action(String description, String action, String... aliases) { this.description = description; this.action = action; this.aliases = aliases; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -21,7 +21,9 @@ import java.beans.PropertyChangeListener; import java.util.List; import java.util.Locale; -import jaxx.runtime.Util; + +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.context.DefaultApplicationContext; import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,18 +40,18 @@ * * @author chemit */ -public class I18nEditorContext extends jaxx.runtime.context.DefaultApplicationContext { +public class I18nEditorContext extends DefaultApplicationContext { /** to use log facility, just put in your code: log.info(\"...\"); */ static private final Log log = LogFactory.getLog(I18nEditorContext.class); //------------------------------------------- // UI instances //------------------------------------------- - public static final JAXXContextEntryDef<I18nEditorUI> MAIN_UI_ENTRY_DEF = Util.newContextEntryDef("mainui", I18nEditorUI.class); - public static final JAXXContextEntryDef<I18nProject> PROJECT_DEF = Util.newContextEntryDef(I18nProject.class); - private static final JAXXContextEntryDef<String> SELECTED_KEY_DEF = Util.newContextEntryDef("selectedKey", String.class); - private static final JAXXContextEntryDef<String> RE_SELECTED_KEY_DEF = Util.newContextEntryDef("reSelectedKey", String.class); - private static final JAXXContextEntryDef<TreeModelMode> TREE_MODEL_MODE_DEF = Util.newContextEntryDef(TreeModelMode.class); + public static final JAXXContextEntryDef<I18nEditorUI> MAIN_UI_ENTRY_DEF = JAXXUtil.newContextEntryDef("mainui", I18nEditorUI.class); + public static final JAXXContextEntryDef<I18nProject> PROJECT_DEF = JAXXUtil.newContextEntryDef(I18nProject.class); + private static final JAXXContextEntryDef<String> SELECTED_KEY_DEF = JAXXUtil.newContextEntryDef("selectedKey", String.class); + private static final JAXXContextEntryDef<String> RE_SELECTED_KEY_DEF = JAXXUtil.newContextEntryDef("reSelectedKey", String.class); + private static final JAXXContextEntryDef<TreeModelMode> TREE_MODEL_MODE_DEF = JAXXUtil.newContextEntryDef(TreeModelMode.class); public static final String PROJECT_PROPERTY = "project"; public static final String SELECTED_PACKAGES_PROPERTY = "selectedPackages"; public static final String SELECTED_BUNDLES_PROPERTY = "selectedBundles"; @@ -58,8 +60,7 @@ /** Séparateur des propriétés */ public static final String SEPARATOR = "."; /** - * l'intance partagée accessible après un appel à la méthode - * {@link #init()} + * l'intance partagée accessible */ protected static I18nEditorContext instance; @@ -67,10 +68,8 @@ * Récupération du contexte applicatif. * * @return l'instance partagé du contexte. - * @throws IllegalStateException si le contexte n'a pas été initialisé via - * la méthode {@link #init()} */ - public static synchronized I18nEditorContext get() throws IllegalStateException { + public static synchronized I18nEditorContext get() { if (instance == null) { instance = new I18nEditorContext(); } @@ -82,7 +81,6 @@ protected final Object lock = new Object(); protected I18nEditorContext() { - super(); TREE_MODEL_MODE_DEF.setContextValue(this, TreeModelMode.TREE); } @@ -205,7 +203,7 @@ /** * close the application's context. * - * @throws java.lang.Exception if any pb while closing + * @throws Exception if any pb while closing */ public void close() throws Exception { if (log.isDebugEnabled()) { @@ -326,7 +324,9 @@ }; public void removeJaxxPropertyChangeListener() { - PropertyChangeListener[] toRemove = jaxx.runtime.Util.findJaxxPropertyChangeListener(DEFAULT_JAXX_PCS, getPropertyChangeListeners()); + PropertyChangeListener[] toRemove = + JAXXUtil.findJaxxPropertyChangeListener( + DEFAULT_JAXX_PCS, getPropertyChangeListeners()); if (toRemove == null || toRemove.length == 0) { return; } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.bundle.I18nBundle; import org.nuiton.i18n.bundle.I18nBundleEntry; -import org.nuiton.i18n.bundle.I18nBundleFactory; +import org.nuiton.i18n.bundle.I18nBundleUtil; /** * @@ -75,10 +75,10 @@ protected PropertyChangeSupport pcs; protected AbstractI18nProject() { - this.resources = new LinkedHashMap<String, Properties>(); - this.selectedBundles = new ArrayList<Locale>(); - this.selectedPackages = new ArrayList<String>(); - this.pcs = new PropertyChangeSupport(this); + resources = new LinkedHashMap<String, Properties>(); + selectedBundles = new ArrayList<Locale>(); + selectedPackages = new ArrayList<String>(); + pcs = new PropertyChangeSupport(this); } @Override @@ -129,12 +129,12 @@ @Override public String[] getPackages() { - return I18nBundleFactory.getBundleNames(i18nBundles); + return I18nBundleUtil.getBundleNames(i18nBundles); } @Override public Locale[] getBundles() { - return I18nBundleFactory.getLocales(i18nBundles); + return I18nBundleUtil.getLocales(i18nBundles); } @Override @@ -249,7 +249,7 @@ @Override public void copyDefinitionTo(I18nProject project) { // check we are on the same type of project - if (project.getClass() != getClass()) { + if (!getClass().equals(project.getClass())) { throw new IllegalArgumentException("copyDefinitionTo method must use same project type, but was not! (required : " + getClass() + ", but find " + project.getClass() + 3); } project.setName(name); @@ -268,7 +268,7 @@ selectedPackages.clear(); // detections des bundles i18n a partir des urls donnees - List<I18nBundle> tmp = I18nBundleFactory.detectBundles(urls.toArray(new URL[urls.size()])); + List<I18nBundle> tmp = I18nBundleUtil.detectBundles(urls.toArray(new URL[urls.size()])); i18nBundles = tmp.toArray(new I18nBundle[tmp.size()]); selectedBundles.addAll(Arrays.asList(getBundles())); 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Map.Entry; import org.nuiton.i18n.I18n; -import org.nuiton.i18n.editor.project.impl.DirectoryI18nProject; import org.nuiton.i18n.editor.ui.project.ProjectUIModel; /** @@ -82,7 +81,7 @@ return p; } - public <T extends Object> T getParameter(Class<T> returnType, String propertyName, Map<String, Object> parameters, boolean mustExist) { + public <T> T getParameter(Class<T> returnType, String propertyName, Map<String, Object> parameters, boolean mustExist) { Map<String, Class<?>> map = getAuthorizedParameters(); // check name if (!map.containsKey(propertyName)) { @@ -90,7 +89,7 @@ } // check type Class<?> requiredType = map.get(propertyName); - if (returnType != requiredType && !returnType.isAssignableFrom(requiredType)) { + if (!returnType.equals(requiredType) && !returnType.isAssignableFrom(requiredType)) { throw new IllegalArgumentException("the property " + propertyName + " must be of the type " + requiredType + ", but was : " + requiredType); } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -92,7 +92,11 @@ try { Properties p = new Properties(); stream = new FileInputStream(projectFile); - p.load(stream); + try { + p.load(stream); + } finally { + stream.close(); + } String tmp = p.getProperty(AbstractI18nProjectProvider.CLASS_PARAMETER); Class<? extends I18nProject> projectClass = (Class<? extends I18nProject>) Class.forName(tmp); @@ -152,7 +156,7 @@ public static <P extends I18nProject> I18nProjectProvider<P> getProvider(Class<P> projectClass) { for (I18nProjectProvider<?> p : getProviders()) { - if (p.getType() == projectClass) { + if (projectClass.equals(p.getType())) { return (I18nProjectProvider<P>) p; } } Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -34,7 +34,6 @@ protected File directorySource = new File(""); public DirectoryI18nProject() { - super(); } public File getDirectorySource() { 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -27,11 +27,12 @@ import java.util.Map; import java.util.Properties; import java.util.TreeMap; -import org.nuiton.i18n.I18n; import org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI; import org.nuiton.i18n.editor.ui.project.ProjectUIModel; import org.nuiton.util.ConverterUtil; +import static org.nuiton.i18n.I18n.*; + /** * * @author chemit @@ -39,7 +40,10 @@ public class DirectoryI18nProjectProvider extends AbstractI18nProjectProvider<DirectoryI18nProject> { public DirectoryI18nProjectProvider() { - super(DirectoryI18nProject.class, I18n.n_("i18neditor.project.type.directory"), I18n.n_("i18neditor.project.type.directory.description")); + super(DirectoryI18nProject.class, + n_("i18neditor.project.type.directory"), + n_("i18neditor.project.type.directory.description") + ); } @Override Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -40,7 +40,6 @@ protected boolean uniqueJarDefinition; public JarI18nProject() { - super(); } public File getJarSource() { 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -20,6 +20,8 @@ import java.io.File; import java.io.IOException; + +import org.nuiton.i18n.bundle.I18nBundleUtil; import org.nuiton.i18n.editor.project.AbstractI18nProjectProvider; import java.net.URL; import java.net.URLClassLoader; @@ -31,7 +33,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.i18n.bundle.I18nBundleFactory; import org.nuiton.i18n.editor.project.I18nProjectConfigurePanelUI; import org.nuiton.i18n.editor.ui.project.ProjectUIModel; import org.nuiton.util.ConverterUtil; @@ -141,7 +142,7 @@ urls.remove(u); } } else { - urls = Resource.getURLs(I18nBundleFactory.SEARCH_BUNDLE_PATTERN, loader); + urls = Resource.getURLs(I18nBundleUtil.SEARCH_BUNDLE_PATTERN, loader); log.info("detected bundles : " + urls); } return urls; 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx 2010-03-07 16:58:44 UTC (rev 1706) @@ -30,6 +30,9 @@ <style source='I18nEditorUI.css'/> <script><![CDATA[ +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + import jaxx.runtime.SwingUtil; import javax.swing.tree.*; import java.util.Locale; @@ -266,7 +269,7 @@ <jaxx.runtime.swing.editor.I18nEditor id='changeI18n' opaque='false' showText='false' - locales='{java.util.Arrays.asList(org.nuiton.i18n.I18n.getLoader().getLocales())}' + locales='{java.util.Arrays.asList(org.nuiton.i18n.I18n.getStore().getLocales())}' selectedLocale='{config.getLocale()}'/> </JToolBar> </JMenuBar> 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -25,6 +25,8 @@ import java.util.Map; import java.util.Set; import javax.swing.JMenu; + +import jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder; import org.nuiton.i18n.editor.*; import java.awt.Desktop; import java.io.File; @@ -61,6 +63,7 @@ import org.nuiton.i18n.editor.ui.project.ProjectUIModel; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.editor.I18nEditorConfig.Option; /** * @@ -83,7 +86,7 @@ */ public I18nEditorUI initUI(I18nEditorContext context, boolean fullscreen) { - final I18nEditorUI ui = new I18nEditorUI(context); + I18nEditorUI ui = new I18nEditorUI(context); I18nEditorContext.MAIN_UI_ENTRY_DEF.setContextValue(context, ui); @@ -399,7 +402,7 @@ project.deleteKey(packageName, locale, key); } - final BundleValuesUI ui = sourceUI.getParentContainer(BundleValuesUI.class); + BundleValuesUI ui = sourceUI.getParentContainer(BundleValuesUI.class); ui.getBundlesContent().remove(sourceUI); if (ui.getBundlesContent().getComponentCount() == 0) { Container parent = ui.getParent(); @@ -484,22 +487,49 @@ public void showConfig(I18nEditorContext context) { I18nEditorUI ui = getUI(context); - ConfigUIModel model = new ConfigUIModel(context.getConfig()); - model.addCategory( - n_("i18neditor.config.category.directories"), - n_("i18neditor.config.category.directories.description"), - I18nEditorConfig.Option.CONFIG_FILE, - I18nEditorConfig.Option.PROJECTS_DIRECTORY, - I18nEditorConfig.Option.TMP_DIRECTORY); + ConfigUIModelBuilder builder = new ConfigUIModelBuilder(); - model.addCategory( - n_("i18neditor.config.category.ui"), - n_("i18neditor.config.category.ui.description"), - I18nEditorConfig.Option.FULL_SCREEN, - I18nEditorConfig.Option.LOCALE); + builder.createModel(ui.getContext().getConfig()); - ConfigUI configUI = ConfigUIBuilder.newConfigUI(context, model, "i18neditor.config.category.ui"); + //TODO Add callbacks +// builder.registerCallBack( +// "application", +// n_("i18neditor.action.reload.application"), +// UIHelper.createActionIcon("reload-application"), +// reloadApplicationCallback +// ); + + builder.addOption(Option.CONFIG_FILE); + builder.addOption(Option.PROJECTS_DIRECTORY); + builder.addOption(Option.TMP_DIRECTORY); +// +// model.addCategory( +// 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") + ); + + builder.addOption(Option.FULL_SCREEN); + builder.addOption(Option.LOCALE); +// +// model.addCategory( +// n_("i18neditor.config.category.ui"), +// n_("i18neditor.config.category.ui.description"), +// Option.FULL_SCREEN, +// Option.LOCALE); + + ConfigUIModel model = builder.flushModel(); + + ConfigUI configUI = ConfigUIBuilder.newConfigUI( + context, model, "i18neditor.config.category.ui"); + ConfigUIBuilder.showConfigUI(configUI, ui, false); // configUI.showInDialog(ui, ui != null); } @@ -769,7 +799,7 @@ reloadKeys(ui); } - protected void closeProjectUI(final I18nEditorUI ui, I18nProject project) { + protected void closeProjectUI(I18nEditorUI ui, I18nProject project) { if (ui == null) { return; @@ -883,7 +913,7 @@ log.debug("adding package " + p); } bundleValuesUI.setBundles(new ArrayList<Locale>(values.keySet())); - for (java.util.Map.Entry<Locale, String> e : values.entrySet()) { + for (Map.Entry<Locale, String> e : values.entrySet()) { BundleValueUI v = new BundleValueUI(bundleValuesUI); v.setBundle(e.getKey()); if (log.isDebugEnabled()) { 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PropertiesTreeModel.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -56,7 +56,7 @@ */ public PropertiesTreeModel(TreeModelMode mode, String... list) { super(null); - this.keys = list; + keys = list; // Création de la racine (qui n'est jamais affichee) PropertieNode r = new PropertieNode(""); 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectStep.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -18,6 +18,8 @@ */ package org.nuiton.i18n.editor.ui.project; +import jaxx.runtime.swing.wizard.WizardStep; + import static org.nuiton.i18n.I18n.n_; /** @@ -25,32 +27,32 @@ * * @author tchemit */ -public enum ProjectStep implements jaxx.runtime.swing.wizard.WizardStep { +public enum ProjectStep implements WizardStep { - /** - * pour choisir le type de projet a creer (@see ProjectType) - */ - CHOOSE_PROJECT_TYPE(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")), - /** - * pour choisir les bundles parmis ceux trouvés - */ - SELECT_BUNDLES(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")), - /** - * pour confirmer et charger le projet - */ - RESUME(n_("i18neditor.project.step.resume"), n_("i18neditor.project.step.resume.description")); + /** pour choisir le type de projet a creer (@see ProjectType) */ + CHOOSE_PROJECT_TYPE( + 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")), + /** pour choisir les bundles parmis ceux trouvés */ + SELECT_BUNDLES( + 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")), + /** pour confirmer et charger le projet */ + RESUME(n_("i18neditor.project.step.resume"), + n_("i18neditor.project.step.resume.description")); + private final String label; + private final String description; - private ProjectStep(String label, String description) { + ProjectStep(String label, String description) { this.label = label; this.description = description; } 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx 2010-03-07 16:58:44 UTC (rev 1706) @@ -35,8 +35,8 @@ import jaxx.runtime.swing.editor.MyDefaultCellEditor; import jaxx.runtime.swing.wizard.WizardOperationState; import jaxx.runtime.swing.wizard.WizardUtil; -import static jaxx.runtime.Util.newContextEntryDef; -import static jaxx.runtime.Util.checkJAXXContextEntry; +import static jaxx.runtime.JAXXUtil.newContextEntryDef; +import static jaxx.runtime.JAXXUtil.checkJAXXContextEntry; import org.nuiton.i18n.editor.I18nEditorContext; import org.nuiton.i18n.editor.I18nEditorConfig; Modified: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java =================================================================== --- trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -70,12 +70,12 @@ ProjectStep.SELECT_BUNDLES, ProjectStep.PERSIST, ProjectStep.RESUME); - this.projects = new HashMap<I18nProjectProvider<?>, I18nProject>(); + projects = new HashMap<I18nProjectProvider<?>, I18nProject>(); // init map of different types of projects Set<I18nProjectProvider<?>> providers = I18nProjectFactory.getProviders(); for (I18nProjectProvider<?> p : providers) { I18nProject newProject = p.newProject(); - this.projects.put(p, newProject); + projects.put(p, newProject); // the model listens every modification of each project // and at each time revalidate the model newProject.addPropertyChangeListener(new PropertyChangeListener() { @@ -96,7 +96,7 @@ * * @param ui l'ui de l'assistant */ - public void finalizeUIInit(final ProjectUI ui) { + public void finalizeUIInit(ProjectUI ui) { config = ui.getContextValue(I18nEditorConfig.class); @@ -211,9 +211,9 @@ I18nProjectProvider<?> oldType = this.type; this.type = type; firePropertyChange(TYPE_PROPERTY_NAME, oldType, type); - I18nProject oldProject = this.project; + I18nProject oldProject = project; I18nProject newProject = projects.get(type); - this.project = newProject; + project = newProject; firePropertyChange(PROJECT_PROPERTY_NAME, oldProject, newProject); validate(); } 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java 2010-03-07 16:58:44 UTC (rev 1706) @@ -20,6 +20,7 @@ import java.net.URL; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Set; import javax.swing.table.AbstractTableModel; @@ -46,8 +47,7 @@ protected boolean selectAll; public SelectBundlesTableModel() { - super(); - selected = new java.util.HashSet<Integer>(); + selected = new HashSet<Integer>(); } @Override @@ -62,7 +62,7 @@ public void setUrls(List<URL> entries) { // on nettoye toujours le model lors de l'init d'une entité - this.entries = new java.util.ArrayList<URL>(entries); + this.entries = new ArrayList<URL>(entries); // selected.clear(); // par defaut, on selectionne toutes les references setSelectAll(true); @@ -173,7 +173,6 @@ } } fireTableCellUpdated(rowIndex, columnIndex); - return; } // no edit for others columns 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.css 2010-03-07 16:58:44 UTC (rev 1706) @@ -31,7 +31,7 @@ } #descriptionPane { - columnHeaderView:{new JLabel(_("i18neditor.common.descrition"), jaxx.runtime.Util.getUIManagerActionIcon("information"), 10)}; + columnHeaderView:{new JLabel(_("i18neditor.common.descrition"), SwingUtil.getUIManagerActionIcon("information"), 10)}; } #description { 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx 2010-03-07 16:58:44 UTC (rev 1706) @@ -26,6 +26,9 @@ <AbstractProjectTabPanelUI _step='{ProjectStep.CHOOSE_PROJECT_TYPE}'> <script><![CDATA[ +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + import org.nuiton.i18n.editor.*; import org.nuiton.i18n.editor.project.*; import org.nuiton.i18n.editor.ui.project.*; 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 2010-03-07 16:16:45 UTC (rev 1705) +++ trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx 2010-03-07 16:58:44 UTC (rev 1706) @@ -26,6 +26,9 @@ <script><![CDATA[ import jaxx.runtime.SwingUtil; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + import org.nuiton.i18n.editor.*; import org.nuiton.i18n.editor.project.I18nProject; import org.nuiton.i18n.editor.project.AbstractI18nProject;
participants (1)
-
tchemit@users.nuiton.org