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

r1345 - branches
by tchemit＠users.labs.libre-entreprise.org March 15, 2008

March 15, 2008

Author: tchemit Date: 2008-03-15 02:01:09 +0000 (Sat, 15 Mar 2008) New Revision: 1345 Added: branches/20080315_before_commandline_split/ Log: create branche to work on swing-cxommandline split Copied: branches/20080315_before_commandline_split (from rev 1344, trunk)

1 0

r1344 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions
by tchemit＠users.labs.libre-entreprise.org March 15, 2008

March 15, 2008

Author: tchemit Date: 2008-03-15 01:40:52 +0000 (Sat, 15 Mar 2008) New Revision: 1344 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java Log: passage en maven-commandline-plugin:0.3 prochaine ?\195?\169tape : split du module Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-03-15 01:40:46 UTC (rev 1343) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerCommonActions.java 2008-03-15 01:40:52 UTC (rev 1344) @@ -19,10 +19,11 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.commandline.actions; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain; import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionEditConfig; import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionShowConfig; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; +import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; @@ -47,34 +48,36 @@ public static class HelpAction extends SimExplorerAbstractOptionActionHelp { - protected void run() throws Exception { + + protected void run(SimExplorerAbstractContext context) throws Exception { log.info("required help action"); StringWriter writer = new StringWriter(); - getParser().printUsage(writer, "SimExplorer SI v " + getContext().getConfig().getVersion()); - printConfig(writer, getParser().getMainConfig()); + context.getParser().printUsage(writer, "SimExplorer SI v " + context.getConfig().getVersion()); + printConfig(writer, context.getConfig()); writer.append('\n'); log.info(writer); - getContext().setQuit(true); + context.setQuit(true); } + } public static class ConfigAction extends SimExplorerAbstractOptionActionConfig { - protected void run() throws Exception { + protected void run(SimExplorerAbstractContext context) throws Exception { // Do nothing, this action is treated while init of config files } } public static class ShowConfigAction extends SimExplorerAbstractOptionActionShowConfig { @Override - protected void beforeAll(SimExplorerOptionShowConfig... options) { - super.beforeAll(options); + protected void beforeAll(SimExplorerAbstractContext context, SimExplorerOptionShowConfig... options) { + super.beforeAll(context, options); // check we have not twice config } - public void run() throws Exception { - SimExplorerAbstractConfigMain conf; - conf = getParser().getMainConfig(); + public void run(SimExplorerAbstractContext context) throws Exception { + SimExplorerConfigMain conf; + conf = context.getConfig(); String category = option.getConstantArgumentValue(0); if (conf == null) { @@ -84,29 +87,29 @@ StringWriter writer = new StringWriter(); printConfig(writer, conf); log.info(writer); - getContext().setQuit(true); + context.setQuit(true); } } public static class EditConfigAction extends SimExplorerAbstractOptionActionEditConfig { @Override - protected void beforeAll(SimExplorerOptionEditConfig... options) { - super.beforeAll(options); + protected void beforeAll(SimExplorerAbstractContext context, SimExplorerOptionEditConfig... options) { + super.beforeAll(context, options); // check we have not twice config } - public void run() throws Exception { - log.info("required editConfig action"); - SimExplorerActionManager.fireAction("config",this); + public void run(SimExplorerAbstractContext context) throws Exception { + log.info("required editConfig action"); + SimExplorerActionManager.fireAction("config", this); } } public static class ResetConfigAction extends SimExplorerAbstractOptionActionResetConfig { - public void run() throws Exception { - getContext().getConfig().getConfigFileName().delete(); + public void run(SimExplorerAbstractContext context) throws Exception { + context.getConfig().getConfigFileName().delete(); log.info(_("simexplorer.message.reset.user.configuration")); - getContext().setFirstLaunch(true); + context.setFirstLaunch(true); } } @@ -114,13 +117,13 @@ public static class UiAction extends SimExplorerAbstractOptionActionUi { protected boolean init = false; - public void run() throws Exception { + public void run(SimExplorerAbstractContext context) throws Exception { Boolean bool = isValue(); boolean launchUI = bool != null && bool; log.info(option.getUsedAlias() + ", value:" + bool); - getContext().setLaunchUI(launchUI); + context.setLaunchUI(launchUI); if (init) { - getContext().setQuit(true); + context.setQuit(true); } init = true; }

1 0

r1343 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org March 15, 2008

March 15, 2008

Author: tchemit Date: 2008-03-15 01:40:46 +0000 (Sat, 15 Mar 2008) New Revision: 1343 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java Log: passage en maven-commandline-plugin:0.3 prochaine ?\195?\169tape : split du module Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-15 01:40:38 UTC (rev 1342) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorer.java 2008-03-15 01:40:46 UTC (rev 1343) @@ -20,7 +20,7 @@ import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; +import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.ui.util.ErrorDialog; @@ -54,17 +54,9 @@ */ public static void init(String... args) throws Exception { - // init context - context = new SimExplorerContext(); - - // init context - context.initContext(args); + // init context, parser and configs + context = new SimExplorerContext(args); - // save config - context.getConfig().save(); - - // init services - context.initServices(); } /** Lancement de l'ui après init de l'application. */ @@ -73,7 +65,7 @@ // init ui SimExplorerMainUI mainUI = SimExplorerMainUI.getUI(); - SimExplorerAbstractConfigMain conf = getContext().getConfig(); + SimExplorerConfigMain conf = getContext().getConfig(); if (conf.isShowLocalTab()) { // show local tab @@ -120,7 +112,7 @@ init(args); // launch actions required - context.getParser().doAllActions(); + context.getParser().doAllActions(context); // show edit config if first launch if (context.isFirstLaunch()) {

1 0

r1342 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org March 15, 2008

March 15, 2008

Author: tchemit Date: 2008-03-15 01:40:38 +0000 (Sat, 15 Mar 2008) New Revision: 1342 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java Log: passage en maven-commandline-plugin:0.3 prochaine ?\195?\169tape : split du module Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-15 01:40:18 UTC (rev 1341) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerContext.java 2008-03-15 01:40:38 UTC (rev 1342) @@ -31,10 +31,7 @@ import fr.cemagref.simexplorer.is.service.remote.RemoteService; import fr.cemagref.simexplorer.is.service.remote.RemoteStorageService; import fr.cemagref.simexplorer.is.storage.SortColumn; -import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigLocal; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigRemote; +import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerAbstractContext; import org.codelutin.i18n.I18n; import org.codelutin.option.ParserException; @@ -49,28 +46,10 @@ * * @author chemit */ -public class SimExplorerContext { +public class SimExplorerContext extends SimExplorerAbstractContext { private final static boolean mock = false; - /** - * le parseur utilisé au démarrage pour récupérer les options passées - * par l'utilisateur. - */ - protected SimExplorerOptionParser parser; - - /** flag pour indiquer si 'lon veut quitter l'appli après les options */ - protected boolean quit; - - /** flag pour indiquer si l'on affiche ou non l'ui principale */ - protected boolean launchUI = true; - - /** - * flag pour indiquer une première utilisation de l'application (pas de - * fichier de configuration) - */ - protected boolean firstLaunch; - /** le token pour la connexion au serveur distant */ protected String token; @@ -87,33 +66,6 @@ protected LoggableElementCache remoteCache; /** - * @return le parseur utilisé pour parser les options de la ligne de - * commande. - */ - public SimExplorerOptionParser getParser() { - if (parser == null) { - // creation du parseur - parser = new SimExplorerOptionParser(); - } - return parser; - } - - /** @return la configuration de l'application */ - public SimExplorerAbstractConfigMain getConfig() { - return getParser().getMainConfig(); - } - - /** @return la configuration de l'application */ - public SimExplorerAbstractConfigRemote getRemoteConfig() { - return getParser().getRemoteConfig(); - } - - /** @return la configuration de l'application */ - public SimExplorerAbstractConfigLocal getLocalConfig() { - return getParser().getLocalConfig(); - } - - /** * @return <code>true</code> si l'utilisateur est connecté, * <code>false</code> sinon. */ @@ -122,31 +74,6 @@ } /** - * @return <code>true</code> si on doit quitter l'application (uniquement utilisé - * lors du démarrage de l'application lors de l'exécution des options - * utilisateurs) - */ - public boolean isQuit() { - return quit; - } - - /** - * @return <code>true</code> si on doit lancer l'ui au démarrage de - * l'application, après avoir traité toutes les options utilisateurs - */ - public boolean isLaunchUI() { - return launchUI; - } - - /** - * @return <code>true</code> s'il s'agit de la première utilisation de - * l'application (aucun de fichier de configuration trouvé) - */ - public boolean isFirstLaunch() { - return firstLaunch; - } - - /** * @return le token utilisé pour identifié l'utilisateur sur le serveur distant. * * Si est null ou vide cela veut que l'utilisateur n'est pas connecté. @@ -155,18 +82,6 @@ return token; } - public void setQuit(boolean quit) { - this.quit = quit; - } - - public void setLaunchUI(boolean launchUI) { - this.launchUI = launchUI; - } - - public void setFirstLaunch(boolean firstLaunch) { - this.firstLaunch = firstLaunch; - } - public void setToken(String token) { this.token = token; } @@ -235,7 +150,7 @@ } } - public String loginUser(boolean remote, String login, String hashPassword) throws UnreachableServiceException { + public String loginUser(boolean remote, String login, String hashPassword) throws UnreachableServiceException { StorageService service = getStorageService(remote); try { String token; @@ -262,34 +177,19 @@ return cache; } - /** restricted access constructor */ - SimExplorerContext() { - } - /** - * Initialisation du parseur d'options. + * restricted access constructor * - * @param args les arguments passés au démarrage de l'application + * @param args argumentsfor parser + * @throws java.io.IOException if pb while saing configuration + * @throws org.codelutin.option.ParserException + * if pb while parsing arguments */ - void initContext(String... args) { - try { - // parse arguments - getParser().doParse(args); + SimExplorerContext(String... args) throws IOException, ParserException { - // init configs - getParser().initConfigs(); + super(args); - // init i18n with user locale (or default one if not found) - initI18n(); - - // mark if first launch - setFirstLaunch(!getConfig().getSource().exists()); - - } catch (ParserException e) { - throw new SimExplorerRuntimeException(e); - } catch (IOException e) { - throw new SimExplorerRuntimeException(e); - } + initServices(); } @@ -305,10 +205,8 @@ throw new SimExplorerRuntimeException(e); } } - if (localService != null) { - // init the cache - localCache = new LoggableElementCache(this, localService); - } + // init the cache + localCache = new LoggableElementCache(this, localService); } return localService; }

1 0

r1341 - trunk/simexplorer-is/simexplorer-is-swing
by tchemit＠users.labs.libre-entreprise.org March 15, 2008

March 15, 2008

Author: tchemit Date: 2008-03-15 01:40:18 +0000 (Sat, 15 Mar 2008) New Revision: 1341 Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml Log: passage en maven-commandline-plugin:0.3 prochaine ?\195?\169tape : split du module Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-14 23:35:11 UTC (rev 1340) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-15 01:40:18 UTC (rev 1341) @@ -66,28 +66,29 @@ <plugin> <groupId>lutinplugin</groupId> <artifactId>maven-commandline-plugin</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.3</version> <configuration> <prefix>SimExplorer</prefix> <i18nPrefix>simexplorer</i18nPrefix> <source>${maven.vcs.src.dir}/resources/commandline.properties</source> <parserPackageName>fr.cemagref.simexplorer.is.ui.swing.commandline</parserPackageName> - <actionSuperClass>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionAction</actionSuperClass> - <configSuperClass>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfig</configSuperClass> + <abstractConfigOptionKey>CONFIG_OPTION_KEY</abstractConfigOptionKey> + <abstractConfigFileOptionKey>CONFIG_FILE_OPTION_KEY</abstractConfigFileOptionKey> + <abstractConfigFilenameConfigKey>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain.CONFIG_FILE_NAME_PROPERTY_KEY</abstractConfigFilenameConfigKey> <concreteConfig>true</concreteConfig> <actionImplementations> <value>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions</value> </actionImplementations> <configImplementations> - <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain</value> - <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigLocal</value> - <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigRemote</value> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigMain</value> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigLocal</value> + <value>fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerConfigRemote</value> </configImplementations> </configuration> <executions> <execution> <goals> - <goal>java</goal> + <goal>genJava</goal> </goals> </execution> </executions>

1 0

r1340 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util
by tchemit＠users.labs.libre-entreprise.org March 14, 2008

March 14, 2008

Author: tchemit Date: 2008-03-14 23:35:11 +0000 (Fri, 14 Mar 2008) New Revision: 1340 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java Log: javadoc Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-03-14 23:34:51 UTC (rev 1339) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java 2008-03-14 23:35:11 UTC (rev 1340) @@ -38,7 +38,7 @@ import java.awt.event.ActionEvent; /** - * La classe de base à utiliser pour toutes les action de l'application + * La classe de base à utiliser pour toutes les actions de l'application * * @author chemit */

1 0

r1339 - trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite
by tchemit＠users.labs.libre-entreprise.org March 14, 2008

March 14, 2008

Author: tchemit Date: 2008-03-14 23:34:51 +0000 (Fri, 14 Mar 2008) New Revision: 1339 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java Log: simplify boolean test Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-14 23:29:21 UTC (rev 1338) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/composite/SimpleComposite.java 2008-03-14 23:34:51 UTC (rev 1339) @@ -62,10 +62,7 @@ } protected boolean visitEnterIfNotEmpty(EntityVisitor visitor) { - if (size() == 0) { - return false; - } - return super.visitEnter(visitor); + return size() != 0 && super.visitEnter(visitor); } /* (non-Javadoc) @@ -116,7 +113,7 @@ */ @SuppressWarnings("unchecked") public Class<E> getChildrenClass() { - Class<E> eClass = null; + Class<E> eClass; Type type = getClass().getGenericSuperclass(); if (type instanceof ParameterizedType) {

1 0

r1338 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions
by tchemit＠users.labs.libre-entreprise.org March 14, 2008

March 14, 2008

Author: tchemit Date: 2008-03-14 23:29:21 +0000 (Fri, 14 Mar 2008) New Revision: 1338 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerAbstractOptionAction.java Log: AbstractoptionAction does no more have a reference to context, the context is given as paramteter in methods instead : in that way, only need to know concrete context in user code Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerAbstractOptionAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerAbstractOptionAction.java 2008-03-14 23:23:23 UTC (rev 1337) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/actions/SimExplorerAbstractOptionAction.java 2008-03-14 23:29:21 UTC (rev 1338) @@ -1,47 +0,0 @@ -/* -* ##% 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.ui.swing.commandline.actions; - -import fr.cemagref.simexplorer.is.ui.swing.SimExplorer; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext; -import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser; -import org.codelutin.option.Option; -import org.codelutin.option.OptionAction; - -/** - * Implantation de base des actions spécifiques au parseur <code>SimExplorerOptionParser</code>. - * - * @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

r1337 - trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities
by tchemit＠users.labs.libre-entreprise.org March 14, 2008

March 14, 2008

Author: tchemit Date: 2008-03-14 23:23:23 +0000 (Fri, 14 Mar 2008) New Revision: 1337 Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java Log: javadoc Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-14 23:22:45 UTC (rev 1336) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/EntityHelper.java 2008-03-14 23:23:23 UTC (rev 1337) @@ -152,7 +152,7 @@ /** * Instantiates a new action. * - * @param actionName the action name + * @param page the action name * @param actionAvailabilty the action availabilty * @param classes the classes */

1 0

r1336 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org March 14, 2008

March 14, 2008

Author: tchemit Date: 2008-03-14 23:22:45 +0000 (Fri, 14 Mar 2008) New Revision: 1336 Removed: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java Log: deprecated Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-03-14 23:22:32 UTC (rev 1335) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-03-14 23:22:45 UTC (rev 1336) @@ -1,187 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit, Gabriel Landais -* -* 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.ui.swing; - -import com.healthmarketscience.rmiio.SerializableInputStream; -import fr.cemagref.simexplorer.is.entities.EntityTypeEnum; -import fr.cemagref.simexplorer.is.entities.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; -import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.exceptions.UnreachableServiceException; -import fr.cemagref.simexplorer.is.service.StorageService; -import fr.cemagref.simexplorer.is.storage.SortColumn; -import fr.cemagref.simexplorer.is.ui.swing.LoggableElementCache; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; - -/** - * Une classe pour encapsuler les appels aux services Storage et leur initialisation. - * - * @author chemit - * @deprecated use directly service from context - */ -public class StorageServiceHelper { - - /** - * @param context le context de l'application - * @param remote flag pour indiquer le type de service recherché (local ou remote) - * @return le service instancié et initialisé - * @throws UnreachableServiceException si service non joignable - */ - private static StorageService getService(SimExplorerContext context, boolean remote) throws UnreachableServiceException { - StorageService service; - service = context.getStorageService(remote); - return service; - } - - private static String loginUser(SimExplorerContext context, boolean remote, String login, String hashPassword) throws UnreachableServiceException { - StorageService service = getService(context, remote); - try { - String token; - token = service.loginUser(login, hashPassword); - return token; - } catch (SimExplorerException e) { - throw new SimExplorerRuntimeException(e); - } - } - - private static int getCount(SimExplorerContext context, boolean remote, String query, boolean onlyLatest) { - StorageService service = getService(context, remote); - String token = context.getToken(); - int size; - try { - if (query == null || query.isEmpty()) { - size = service.findElementsCount(token, EntityTypeEnum.ExplorationApplication.toString(), onlyLatest); - } else { - size = service.findFullTextCount(token, query, "", onlyLatest); - } - return size; - } catch (SimExplorerException e) { - throw new SimExplorerRuntimeException(e); - } - } - - private static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, SortColumn column, boolean ascending) { - StorageService service = getService(context, remote); - String token = context.getToken(); - try { - MetaData[] data; - if (query == null || query.isEmpty()) { - data = service.findElements(token, EntityTypeEnum.ExplorationApplication.toString(), onlyLatest, (int) newFirstIndex, width, column.name(), ascending); - } else { - data = service.findFullText(token, query, "", onlyLatest, (int) newFirstIndex, width, column.name(), ascending); - //data = service.findFullText(token, query, SearchColumn.AllFields.name(), onlyLatest, (int) newFirstIndex, width, column.name(), ascending); - } - return data; - } catch (SimExplorerException e) { - throw new SimExplorerRuntimeException(e); - } - } - - private static MetaData getMetaData(SimExplorerContext context, boolean remote, String uuid, String version) { - try { - MetaData metas; - metas = getService(context, remote).getMetadata(context.getToken(), uuid, version); - return metas; - } catch (SimExplorerException e1) { - throw new SimExplorerRuntimeException(e1); - } - } - - /** - * @param context the application context - * @param remote flag tosay local or remote - * @param uuid uuid of LoggableElement required - * @param version version of LoggableElement required - * @return the LoggableElement from service - * @deprecated prefer use {@link LoggableElementCache} - */ - private static LoggableElement getElement(SimExplorerContext context, boolean remote, String uuid, String version) { - try { - LoggableElement data; - data = getService(context, remote).getLoggableElement(context.getToken(), uuid, version); - return data; - } catch (SimExplorerException e1) { - throw new SimExplorerRuntimeException(e1); - } - } - - private static void deleteElement(SimExplorerContext context, boolean remote, String uuid, String version) { - try { - getService(context, remote).deleteElement(context.getToken(), uuid, version); - } catch (SimExplorerException e1) { - throw new SimExplorerRuntimeException(e1); - } - } - - - private static BufferedInputStream retrieveElementFull(SimExplorerContext context, boolean remote, String uuid, String version) { - try { - InputStream stream = getService(context, remote).retrieveElementFull(context.getToken(), uuid, version); - BufferedInputStream bis; - bis = new BufferedInputStream(stream); - return bis; - } catch (SimExplorerException e1) { - throw new SimExplorerRuntimeException(e1); - } - } - - private static BufferedInputStream retrieveElementData(SimExplorerContext context, boolean remote, String uuid, String version, Attachment attachment) { - try { - InputStream stream = getService(context, remote).retrieveElementData(context.getToken(), uuid, version, attachment); - BufferedInputStream bis; - bis = new BufferedInputStream(stream); - return bis; - } catch (SimExplorerException e1) { - throw new SimExplorerRuntimeException(e1); - } - } - - private static MetaData importElement(SimExplorerContext context, boolean remote, File file) { - try { - SerializableInputStream zipStream; - zipStream = new SerializableInputStream(new FileInputStream(file)); - MetaData result; - result = getService(context, remote).saveElement(context.getToken(), zipStream).getMetaData(); - return result; - } catch (Exception e) { - throw new SimExplorerRuntimeException(e); - } - } - - private static Version[] getVersions(SimExplorerContext context, boolean remote, String uuid) { - try { - Version[] result; - result = getService(context, remote).getVersions(context.getToken(), uuid); - return result; - } catch (SimExplorerException e) { - throw new SimExplorerRuntimeException(e); - } - } - - protected StorageServiceHelper() { - // no instance - } -}

1 0