- Simexplorer-si-commits - mailman.cloud.codelutin.com

r183 - trunk/simexplorer-is-swing/src/i18n
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:51:55 +0000 (Fri, 18 Jan 2008) New Revision: 183 Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties Log: i18n pour l'ui et les options, config Modified: trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-18 01:51:33 UTC (rev 182) +++ trunk/simexplorer-is-swing/src/i18n/language-en_GB.properties 2008-01-18 01:51:55 UTC (rev 183) @@ -1 +1,56 @@ -#Thu Jan 17 15:12:50 GMT 2008 +#Fri Jan 18 01:44:08 GMT 2008 +can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = +could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = +could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = +simexplorer.admin.menu=Admin +simexplorer.admin.menu.groups=Groups +simexplorer.admin.menu.groups.tooltip= +simexplorer.admin.menu.users=Users +simexplorer.admin.menu.users.tooltip= +simexplorer.change.config.property= +simexplorer.common.cancel=cancel +simexplorer.common.ok=ok +simexplorer.common.reset=reset +simexplorer.config.i18n.menu=I18n +simexplorer.config.i18n.menu.en=English +simexplorer.config.i18n.menu.en.tooltip= +simexplorer.config.i18n.menu.fr=French +simexplorer.config.i18n.menu.fr.tooltip= +simexplorer.config.main.configFileName.description= +simexplorer.config.main.country.description= +simexplorer.config.main.description=Configuration de l'application SimExplorer SI +simexplorer.config.main.firstName.description=Le pr\u00E9nom de l'utilisateur +simexplorer.config.main.language.description=La langue de la locale utilisateur +simexplorer.config.main.lastName.description=Le nom de l'utilisateur +simexplorer.config.main.userMail.description=Le courriel de l'utilisateur +simexplorer.config.main.version.description=La version de l'application +simexplorer.config.menu=Configuration +simexplorer.config.menu.config=Preferences +simexplorer.config.menu.config.tooltip= +simexplorer.config.title=SimExplorer SI configuration modifier +simexplorer.error.unfound.config.property= +simexplorer.help.menu=Help +simexplorer.help.menu.about=About +simexplorer.help.menu.about.tooltip= +simexplorer.help.menu.help=Get help +simexplorer.help.menu.help.tooltip= +simexplorer.help.menu.site=Go to site +simexplorer.help.menu.site.tooltip= +simexplorer.main.menu=Main +simexplorer.main.menu.connect=Connect +simexplorer.main.menu.connect.tooltip= +simexplorer.main.menu.list.application=Applications +simexplorer.main.menu.list.application.tooltip= +simexplorer.main.menu.quit=Quit +simexplorer.main.menu.quit.tooltip= +simexplorer.main.menu.unconnect=Disconnect +simexplorer.main.menu.unconnect.tooltip= +simexplorer.main.ui.title=SimExplorer SI v 0.0.1 +simexplorer.message.reset.user.configuration= +simexplorer.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**. +simexplorer.option.description.configFile=le fichier de configuration utilis\u00E9 +simexplorer.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration +simexplorer.option.description.help=Show this help +simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. +simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration +simexplorer.option.description.ui=launch or not user interface (value) Modified: trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-18 01:51:33 UTC (rev 182) +++ trunk/simexplorer-is-swing/src/i18n/language-fr_FR.properties 2008-01-18 01:51:55 UTC (rev 183) @@ -1 +1,56 @@ -#Thu Jan 17 15:12:50 GMT 2008 +#Fri Jan 18 01:44:08 GMT 2008 +can\ not\ find\ a\ registered\ action\ for\ key\ {0}\ = +could\ not\ found\ for\ action\ key\ {0}\ class\ {1}\ = +could\ not\ load\ actions.properties\ file\ for\ reason\ {0}\ = +simexplorer.admin.menu=Administration +simexplorer.admin.menu.groups=Groupes +simexplorer.admin.menu.groups.tooltip= +simexplorer.admin.menu.users=Utilisateurs +simexplorer.admin.menu.users.tooltip= +simexplorer.change.config.property= +simexplorer.common.cancel=annuler +simexplorer.common.ok=appliquer +simexplorer.common.reset=r\u00E9initialiser +simexplorer.config.i18n.menu=Langue +simexplorer.config.i18n.menu.en=Anglais +simexplorer.config.i18n.menu.en.tooltip= +simexplorer.config.i18n.menu.fr=Fran\u00E7ais +simexplorer.config.i18n.menu.fr.tooltip= +simexplorer.config.main.configFileName.description=Le chemin du fichier de configuration +simexplorer.config.main.country.description=Le pays de la locale utilisateur +simexplorer.config.main.description=La configuration de l'application +simexplorer.config.main.firstName.description=Le pr\u00E9nom de l'utilisateur +simexplorer.config.main.language.description=La langue de la locale utilisateur +simexplorer.config.main.lastName.description=Le nom de l'utilisateur +simexplorer.config.main.userMail.description=Le courriel de l'utilisateur +simexplorer.config.main.version.description=La version du logiciel +simexplorer.config.menu=Configuration +simexplorer.config.menu.config=Pr\u00E9f\u00E9rences +simexplorer.config.menu.config.tooltip= +simexplorer.config.title=SimExplorer SI Pr\u00E9f\u00E9rences +simexplorer.error.unfound.config.property= +simexplorer.help.menu=Aide +simexplorer.help.menu.about=A propos +simexplorer.help.menu.about.tooltip= +simexplorer.help.menu.help=Obtenir de l'aide +simexplorer.help.menu.help.tooltip= +simexplorer.help.menu.site=Le site +simexplorer.help.menu.site.tooltip= +simexplorer.main.menu=Menu principal +simexplorer.main.menu.connect=Connexion +simexplorer.main.menu.connect.tooltip= +simexplorer.main.menu.list.application=Les applications +simexplorer.main.menu.list.application.tooltip= +simexplorer.main.menu.quit=Quitter +simexplorer.main.menu.quit.tooltip= +simexplorer.main.menu.unconnect=D\u00E9connexion +simexplorer.main.menu.unconnect.tooltip= +simexplorer.main.ui.title=SimExplorer SI v 0.0.1 +simexplorer.message.reset.user.configuration= +simexplorer.option.description.config=remplace la valeur d'une propri\u00E9t\u00E9 de clef **key** de la configuration par la valeur **value**. +simexplorer.option.description.configFile=le fichier de configuration utilis\u00E9 +simexplorer.option.description.editConfig=pour lancer l'UI d'\u00E9dition de la configuration +simexplorer.option.description.help=Show this help +simexplorer.option.description.resetConfig=R\u00E9initialisation de la configuration. +simexplorer.option.description.showConfig=Voir les d\u00E9tails d'une configuration +simexplorer.option.description.ui=launch or not user interface (value)

1 0

r182 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:51:33 +0000 (Fri, 18 Jan 2008) New Revision: 182 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerMainUI.java Log: surcharge de l'ui principale TODO la gestion du panel content Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerMainUI.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerMainUI.java 2008-01-18 01:51:33 UTC (rev 182) @@ -0,0 +1,61 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is; + +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; +import fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nAction; +import org.codelutin.i18n.CountryEnum; +import org.codelutin.i18n.LanguageEnum; + +import javax.swing.AbstractButton; +import java.util.regex.Matcher; + +/** @author tony */ +public class SimExplorerMainUI extends SimExplorerUI { + + public SimExplorerMainUI() { + super(); + + // chargement des classes d'implantations des actions d'ui + SimExplorerActionManager.init(); + + // chargement dans l'ui des actions + SimExplorerActionManager.loadActions(this); + + // repaint i18n actions + repaintI18nActions(); + } + + public void repaintI18nActions() { + LanguageEnum language = SimExplorer.getContext().getConfig().getLanguage(); + CountryEnum country = SimExplorer.getContext().getConfig().getCountry(); + String[] actions = SimExplorerActionManager.getActionNames(); + for (String actionName : actions) { + Matcher matcher = ChangeI18nAction.PATTERN_NAME.matcher(actionName); + if (!matcher.matches()) { + continue; + } + AbstractButton button = (AbstractButton) getObjectById(actionName); + ChangeI18nAction action = (ChangeI18nAction) button.getAction(); + boolean enable = !action.equalsLocale(language, country); + button.setEnabled(enable); + } + } +}

1 0

r181 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui: . swing
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:50:51 +0000 (Fri, 18 Jan 2008) New Revision: 181 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx Log: l'ui principale, le component 'content' servira ?\195?\160 afficher l'ui de l'action courante Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-18 01:50:51 UTC (rev 181) @@ -0,0 +1,77 @@ +<JFrame name="mainFrame" title='{_("simexplorer.main.ui.title")}' + defaultCloseOperation='DISPOSE_ON_CLOSE' width='800' height='600'> + <script> + import static org.codelutin.i18n.I18n._; + </script> + + <JMenuBar> +  + <JMenu text='{_("simexplorer.main.menu")}'> + <JMenuItem id="connect" enabled='false' + text='{_("simexplorer.main.menu.connect")}' + toolTipText='{_("simexplorer.main.menu.connect.tooltip")}'/> + <JMenuItem id="unconnect" enabled='false' + text='{_("simexplorer.main.menu.unconnect")}' + toolTipText='{_("simexplorer.main.menu.unconnect.tooltip")}'/> + <JSeparator/> + <JMenuItem id="listApplication" enabled='false' + text='{_("simexplorer.main.menu.list.application")}' + toolTipText='{_("simexplorer.main.menu.list.application.tooltip")}'/> + <JSeparator/> + <JMenuItem id="quit" enabled='false' + text='{_("simexplorer.main.menu.quit")}' + toolTipText='{_("simexplorer.main.menu.quit.tooltip")}'/> + </JMenu> +  + <JMenu text='{_("simexplorer.config.menu")}'> + <JMenu text='{_("simexplorer.config.i18n.menu")}'> + <JMenuItem id="i18n_fr_FR" enabled='false' + text='{_("simexplorer.config.i18n.menu.fr")}' + toolTipText='{_("simexplorer.config.i18n.menu.fr.tooltip")}'/> + <JMenuItem id="i18n_en_GB" enabled='false' + text='{_("simexplorer.config.i18n.menu.en")}' + toolTipText='{_("simexplorer.config.i18n.menu.en.tooltip")}'/> + </JMenu> + <JMenuItem id="config" enabled='false' + text='{_("simexplorer.config.menu.config")}' + toolTipText='{_("simexplorer.config.menu.config.tooltip")}' + /> + </JMenu> +  + <JMenu text='{_("simexplorer.admin.menu")}'> + <JMenuItem id="groups" enabled='false' + text='{_("simexplorer.admin.menu.groups")}' + toolTipText='{_("simexplorer.admin.menu.groups.tooltip")}'/> + <JMenuItem id="users" enabled='false' + text='{_("simexplorer.admin.menu.users")}' + toolTipText='{_("simexplorer.admin.menu.users.tooltip")}'/> + </JMenu> +  + <JMenu text='{_("simexplorer.help.menu")}'> + <JMenuItem id="help" enabled='false' + text='{_("simexplorer.help.menu.help")}' + toolTipText='{_("simexplorer.help.menu.help.tooltip")}'/> + <JMenuItem id="site" enabled='false' + text='{_("simexplorer.help.menu.site")}' + toolTipText='{_("simexplorer.help.menu.site.tooltip")}'/> + <JMenuItem id="about" enabled='false' + text='{_("simexplorer.help.menu.about")}' + toolTipText='{_("simexplorer.help.menu.about.tooltip")}'/> + </JMenu> + </JMenuBar> + <Table> +  + <row fill="both" weightx="1" weighty="1"> + <cell> + <JPanel id="content"/> + </cell> + </row> +  + <row> + <cell fill="both"> + <org.codelutin.widget.StatusBar id='statusBar'/> + </cell> + </row> + </Table> + +</JFrame>

1 0

r180 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:49:41 +0000 (Fri, 18 Jan 2008) New Revision: 180 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerCommonActions.java Log: les actions d'options de base (config,help,...) Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerCommonActions.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerCommonActions.java 2008-01-18 01:49:41 UTC (rev 180) @@ -0,0 +1,135 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Benjamin Poussin, Tony Chemit +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.actions; + +import fr.cemagref.simexplorer.is.configs.SimExplorerAbstractConfigMain; +import fr.cemagref.simexplorer.is.options.SimExplorerOptionEditConfig; +import fr.cemagref.simexplorer.is.options.SimExplorerOptionShowConfig; +import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; +import org.codelutin.option.Config; +import org.codelutin.option.ui.ConfigTableModel; + +import java.io.IOException; +import java.io.StringWriter; + +/** + * The class to define all common actions that IsisFish can launch at init time. + * + * @author chemit + */ +public class SimExplorerCommonActions { + + private static final Log log = LogFactory.getLog(SimExplorerCommonActions.class); + + static void printConfig(StringWriter writer, Config config) throws IOException { + writer.append('\n').append(config.toString()); + writer.flush(); + } + + public static class HelpAction extends SimExplorerAbstractOptionActionHelp { + + protected void run() throws Exception { + log.info("required help action"); + StringWriter writer = new StringWriter(); + parser.printUsage(writer, "SimExplorer SI v " + getContext().getConfig().getVersion()); + printConfig(writer, parser.getMainConfig()); + writer.append('\n'); + log.info(writer); + getContext().setQuit(true); + } + } + + public static class ShowConfigAction extends SimExplorerAbstractOptionActionShowConfig { + @Override + protected void beforeAll(SimExplorerOptionShowConfig... options) { + super.beforeAll(options); + // check we have not twice config + } + + public void run() throws Exception { + SimExplorerAbstractConfigMain conf; + conf = getParser().getMainConfig(); + + String category = option.getConstantArgumentValue(0); + if (conf == null) { + throw new IllegalArgumentException("could not found a configuration with category " + category); + } + log.info("required showConfig pour category [" + category + "]"); + StringWriter writer = new StringWriter(); + printConfig(writer, conf); + log.info(writer); + getContext().setQuit(true); + } + } + + public static class EditConfigAction extends SimExplorerAbstractOptionActionEditConfig { + @Override + protected void beforeAll(SimExplorerOptionEditConfig... options) { + super.beforeAll(options); + // check we have not twice config + } + + public void run() throws Exception { + SimExplorerAbstractConfigMain conf; + conf = getParser().getMainConfig(); + if (isAll()) { + JConfigUI.showUI(conf, ConfigTableModel.TypeModel.all); + } else if (isTec()) { + JConfigUI.showTechnicalUI(conf); + } else { + JConfigUI.showUI(conf); + } + + StringWriter writer = new StringWriter(); + printConfig(writer, conf); + log.info("required editConfig pour category [" + conf.getCategory() + "]" + writer); + } + } + + public static class ResetConfigAction extends SimExplorerAbstractOptionActionResetConfig { + + public void run() throws Exception { + //IsisFish.firstLaunch = true; + //IsisFish.resetConfig = true; + getContext().getConfig().getConfigFileName().delete(); + log.info(_("simexplorer.message.reset.user.configuration")); + getContext().setFirstLaunch(true); + } + + } + + public static class UiAction extends SimExplorerAbstractOptionActionUi { + protected boolean init = false; + + public void run() throws Exception { + Boolean bool = isValue(); + boolean launchUI = bool != null && bool; + log.info(option.getUsedAlias() + ", value:" + bool); + getContext().setLaunchUI(launchUI); + if (init) { + getContext().setQuit(true); + } + init = true; + } + } +}

1 0

r179 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is: . actions
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:49:10 +0000 (Fri, 18 Jan 2008) New Revision: 179 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerAbstractOptionAction.java Log: la super classe de toutes les actions d'options Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerAbstractOptionAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerAbstractOptionAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/actions/SimExplorerAbstractOptionAction.java 2008-01-18 01:49:10 UTC (rev 179) @@ -0,0 +1,47 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007,2008 Code Lutin. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ + +package fr.cemagref.simexplorer.is.actions; + +import fr.cemagref.simexplorer.is.SimExplorer; +import fr.cemagref.simexplorer.is.SimExplorerContext; +import fr.cemagref.simexplorer.is.SimExplorerOptionParser; +import org.codelutin.option.Option; +import org.codelutin.option.OptionAction; + +/** + * Implantation de base des actions spécifiques au parseur <b><code>SimExplorerOptionParser</code></b>. + * + * @author chemit + * @see OptionAction + */ +public abstract class SimExplorerAbstractOptionAction<O extends Option> extends org.codelutin.option.OptionAction<O, SimExplorerOptionParser> { + + protected SimExplorerContext context; + + public SimExplorerAbstractOptionAction() { + super(SimExplorer.getContext().getParser()); + } + + public SimExplorerContext getContext() { + if (context == null) { + context = SimExplorer.getContext(); + } + return context; + } +}

1 0

r178 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:48:49 +0000 (Fri, 18 Jan 2008) New Revision: 178 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerConfig.java Log: la configuration de l'application (s'appuie sur la classe g?\195?\169n?\195?\169r?\195?\169e par le plugin commandline) Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerConfig.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerConfig.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerConfig.java 2008-01-18 01:48:49 UTC (rev 178) @@ -0,0 +1,131 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is; + +import fr.cemagref.simexplorer.is.configs.SimExplorerAbstractConfigMain; +import fr.cemagref.simexplorer.is.options.SimExplorerOptionConfig; +import fr.cemagref.simexplorer.is.options.SimExplorerOptionConfigFile; +import org.codelutin.i18n.I18n; +import org.codelutin.i18n.LanguageEnum; +import org.codelutin.i18n.CountryEnum; +import static org.codelutin.i18n.I18n._; +import org.codelutin.option.ConfigPropertyKey; +import org.codelutin.option.OptionParser; + +import java.io.File; +import java.io.IOException; + +/** + * L'implantation concrete de la config principale + * + * @author chemit + */ +public class SimExplorerConfig extends SimExplorerAbstractConfigMain { + + public SimExplorerConfig() { + super(); + String home = System.getProperty("user.home"); + if (home == null) { + // this is a serious fatal error + throw new RuntimeException("simexplorer.error.user.home"); + } + doInit(); + } + + public void init() throws Exception { + log.info("start for category [" + category + "] -------------------------"); + + SimExplorerOptionParser parser = SimExplorer.getContext().getParser(); + initConfigFile(parser); + log.info("config file : " + getSource()); + // chargement des valeurs par défaut + loadFromDefaultValue(); + // après le chargement des valeurs par défaut + // la configuration n'est pas modifiée + clearModified(); + // surcharge à partir du fichier de configuration de l'utilisateur + loadFromSource(); + // surcharge à partir des propriétés système + loadFromSystem(); + // surcharge à partir des propriétés de la jvm + loadFromJvm(); + // surcharge à partir de l'option config de la ligne de commande + loadFromOptions(parser); + + for (String s : this.toString().split("\n")) { + log.info(s); + } + log.info("end for category [" + category + "] ---------------------------"); + } + + protected void initConfigFile(OptionParser parser) { + File file; + if (parser.isOptionEnabled(SimExplorerOptionParser.CONFIG_FILE_OPTION_KEY)) { + // surcharge config file + SimExplorerOptionConfigFile option = SimExplorerOptionParser.CONFIG_FILE_OPTION_KEY.getOptions().get(0); + + file = option.getConfigFile(); + } else { + String home = System.getProperty("user.home", ""); + File root = new File(home); + file = new File(root, SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY.getDefaultValue().getName()); + if (!file.exists()) { + SimExplorer.getContext().setFirstLaunch(true); + try { + file.createNewFile(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + if (containsKey(SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY)) { + setProperty(SimExplorerConfig.CONFIG_FILE_NAME_PROPERTY_KEY, file); + } + setSource(file); + } + + public void initI18n() { + I18n.initISO88591(getLanguage().name(), getCountry().name()); + } + + protected void loadFromOptions(SimExplorerOptionParser parser) throws Exception { + if (!parser.isOptionEnabled(SimExplorerOptionParser.CONFIG_OPTION_KEY)) { + return; + } + // surcharge config file + for (SimExplorerOptionConfig option : SimExplorerOptionParser.CONFIG_OPTION_KEY.getOptions()) { + if (getCategory().equals(SimExplorerOptionParser.MAIN_CONFIG_KEY.getCategory())) { + ConfigPropertyKey<?> propKey = getPropertyKey(option.getKey()); + if (propKey == null) { + // fatal error , could not found a matching configuration property + throw new IllegalArgumentException(_("simexplorer.error.unfound.config.property", category, option.getKey())); + } + Object oldVal = propKey.getCurrentValue(); + setProperty(propKey, option.getValue()); + Object newVal = propKey.getCurrentValue(); + log.info(_("simexplorer.change.config.property", category, propKey, oldVal, newVal)); + } + } + } + + public void setI18n(LanguageEnum language, CountryEnum country) { + setLanguage(language); + setCountry(country); + } +} \ No newline at end of file

1 0

r177 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:48:07 +0000 (Fri, 18 Jan 2008) New Revision: 177 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerContext.java Log: le context utilisateur de l'application, un singleton charg?\195?\169 ?\195?\160 l'init de l'application et qui contient le parseur d'options, la config, ... Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerContext.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorerContext.java 2008-01-18 01:48:07 UTC (rev 177) @@ -0,0 +1,127 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is; + +import fr.cemagref.simexplorer.is.actions.SimExplorerCommonActions; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.option.ParserException; + +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; + +/** + * Le context de l'application, implanté en singleton. + * <p/> + * Contient la configuration de l'application, le parseur d'options,... + * + * @author chemit + */ +public class SimExplorerContext { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(SimExplorerContext.class); + + private SimExplorerOptionParser parser; + private boolean quit; + private boolean launchUI=true; + private boolean firstLaunch; + + public SimExplorerOptionParser getParser() { + if (parser == null) { + // creation du parseur + parser = new SimExplorerOptionParser(); + // enregistrement des actions concretes + parser.registerActions(SimExplorerCommonActions.class); + + // enregistrement des configs concretes + parser.registerConfig(SimExplorerConfig.class); + } + return parser; + } + + public SimExplorerConfig getConfig() { + return (SimExplorerConfig) getParser().getMainConfig(); + } + + public void save() throws IOException { + if (getConfig().getSource() == null) { + return; + } + BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getConfig().getSource())); + try { + getConfig().save(out); + } finally { + out.flush(); + out.close(); + } + } + + public void saveSafely() { + try { + save(); + } catch (Exception e) { + log.warn("simexplorer.error.unsafe.save.config" + e.getMessage(), e); + } + } + + public void setQuit(boolean quit) { + this.quit = quit; + } + + public boolean isQuit() { + return quit; + } + + public void setLaunchUI(boolean launchUI) { + this.launchUI = launchUI; + } + + public boolean isLaunchUI() { + return launchUI; + } + + public void setFirstLaunch(boolean firstLaunch) { + this.firstLaunch = firstLaunch; + } + + public boolean isFirstLaunch() { + return firstLaunch; + } + + /** restricted access constructor */ + SimExplorerContext() { + + } + + void initParser(String... args) { + try { + getParser().doParse(args); + } catch (ParserException e) { + throw new RuntimeException(e); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + void initConfig() { + getConfig().initI18n(); + } +}

1 0

r176 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:47:19 +0000 (Fri, 18 Jan 2008) New Revision: 176 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorer.java Log: l'application :) Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorer.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/SimExplorer.java 2008-01-18 01:47:19 UTC (rev 176) @@ -0,0 +1,121 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is; + +import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; +import org.codelutin.i18n.I18n; +import org.codelutin.option.ui.ConfigTableModel; + +import java.io.IOException; + +/** @author tony */ +public class SimExplorer { + + /** le context principal de l'application */ + protected static SimExplorerContext context; + + /** l'ui principale de l'application */ + protected static SimExplorerMainUI ui; + + public static SimExplorerContext getContext() { + checkInitContext(); + return context; + } + + public static SimExplorerMainUI getUI() { + checkInitContext(); + if (ui == null) { + ui = new SimExplorerMainUI(); + } + return ui; + } + + public static void reloadUI() { + ui = null; + JConfigUI.reloadUI(); + } + + /** + * initialisation de l'application : + * <p/> + * chargement du context + * + * @param args les arguments passés à l'application + */ + public static void init(String... args) { + + // init context + context = new SimExplorerContext(); + + // init i18n + I18n.initISO88591(); + + // init parser + context.initParser(args); + + // init config + context.initConfig(); + + // save config + try { + context.save(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + /** + * Lancement de l'ui. + * <p/> + * TODO ne doit être lancée que si nécessaire. + */ + public static void launch() { + + getUI().setVisible(true); + } + + public static void main(String... args) throws Exception { + + init(args); + + // launch actions required + context.getParser().doAllActions(); + + // show edit config if first launch + if (SimExplorer.context.isFirstLaunch()) { + JConfigUI.showUI(context.getConfig(), ConfigTableModel.TypeModel.all); + } + + // launch ui only if required + if (!context.isQuit() && context.isLaunchUI()) { + launch(); + } + + } + + protected SimExplorer() { + // protected restricted access + } + + protected static void checkInitContext() { + if (context == null) { + throw new IllegalStateException("context is null, you must init first the " + SimExplorer.class.getName() + " class via init method"); + } + } +}

1 0

r175 - trunk/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:46:23 +0000 (Fri, 18 Jan 2008) New Revision: 175 Added: trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties Log: le fichier de d?\195?\169finition des options et de la configuration de l'application Added: trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties (rev 0) +++ trunk/simexplorer-is-swing/src/resources/SimExplorerSI_init.properties 2008-01-18 01:46:23 UTC (rev 175) @@ -0,0 +1,51 @@ +### +### common options +### +showConfig.option.definition=--show-config {0,1} [all|tec] +editConfig.option.definition=--edit-config {0,1} [all|tec] +configFile.option.definition=--config-file <configFile:File> +config.option.definition=--config * <key:String> <value:String> +help.option.definition=--help|-h +resetConfig.option.definition=--resetConfig +ui.option.definition=--ui <value:Boolean> + +### +### define others options +### + +### +### les propriétés de la configuration principal +### + +main.config.definition.configFileName=java.io.File:.simexplorer-si-1 +main.config.modifiers.configFileName=final,mandatory,transient + +main.config.definition.country=org.codelutin.i18n.CountryEnum:FR +main.config.modifiers.country=mandatory + +##main.config.definition.defaultBackupDirectory=java.io.File:simexplorer-si-backup +##main.config.modifiers.defaultBackupDirectory=final,mandatory + +main.config.definition.language=org.codelutin.i18n.LanguageEnum:fr +main.config.modifiers.language=mandatory + +#main.config.definition.login=java.lang.String:anonymous +#main.config.modifiers.login=mandatory + +#main.config.definition.server=java.net.URL:http:// +#main.config.modifiers.server=mandatory + +#main.config.definition.smtpServer=java.lang.String:smtp +#main.config.modifiers.smtpServer=mandatory + +main.config.definition.userMail=java.lang.String +main.config.modifiers.userMail=mandatory + +main.config.definition.firstName=java.lang.String +main.config.modifiers.firstName=mandatory + +main.config.definition.lastName=java.lang.String +main.config.modifiers.lastName=mandatory + +main.config.definition.version=org.codelutin.util.VersionNumber:0.0.1 +main.config.modifiers.version=final,static,mandatory

1 0

r174 - trunk/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 18 Jan '08

18 Jan '08

Author: tchemit Date: 2008-01-18 01:45:57 +0000 (Fri, 18 Jan 2008) New Revision: 174 Added: trunk/simexplorer-is-swing/src/resources/log4j.properties Log: log4j Added: trunk/simexplorer-is-swing/src/resources/log4j.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/log4j.properties (rev 0) +++ trunk/simexplorer-is-swing/src/resources/log4j.properties 2008-01-18 01:45:57 UTC (rev 174) @@ -0,0 +1,12 @@ +# Global logging configuration +log4j.rootLogger=ERROR, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n + +# package level +log4j.logger.fr.cemagref.simexplorer.is=DEBUG +log4j.logger.org.codelutin=INFO + +

1 0