March 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r1914 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: actions mexico rule simulator simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 05 Mar '09

05 Mar '09

Author: chatellier Date: 2009-03-05 16:53:02 +0000 (Thu, 05 Mar 2009) New Revision: 1914 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java Log: Add prescript mamangement for build only one zip in sensitivity simulation. Works for inprocess simulation for now. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -43,15 +43,15 @@ /** * * @author poussin - * @version $Revision$ + * @version $Revision: 1862 $ * - * Last update: $Date$ - * by : $Author$ + * Last update: $Date: 2009-02-23 16:42:34 +0100 (lun. 23 févr. 2009) $ + * by : $Author: chatellier $ */ public class ExportAction { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ExportAction.class); + private static Log log = LogFactory.getLog(ExportAction.class); protected IsisConfig config = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,6 +21,10 @@ import static org.codelutin.i18n.I18n._; +import java.io.File; + +import org.codelutin.util.FileUtil; + import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.ExportStorage; @@ -30,24 +34,17 @@ import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; -import java.io.File; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; /** * * @author poussin - * @version $Revision$ + * @version $Revision: 1862 $ * - * Last update: $Date$ - * by : $Author$ + * Last update: $Date: 2009-02-23 16:42:34 +0100 (lun. 23 févr. 2009) $ + * by : $Author: chatellier $ */ public class ImportAction { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ImportAction.class); - protected IsisConfig config = null; public ImportAction(IsisConfig config) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -21,26 +21,27 @@ import static org.codelutin.i18n.I18n._; -import fr.ifremer.isisfish.IsisConfig; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.vcs.VCS; import java.io.File; -import java.util.Arrays; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import fr.ifremer.isisfish.IsisConfig; +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.vcs.VCS; + /** * * @author poussin - * @version $Revision$ + * @version $Revision: 1862 $ * - * Last update: $Date$ - * by : $Author$ + * Last update: $Date: 2009-02-23 16:42:34 +0100 (lun. 23 févr. 2009) $ + * by : $Author: chatellier $ */ public class OtherAction { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(OtherAction.class); + private static Log log = LogFactory.getLog(OtherAction.class); protected IsisConfig config = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -39,18 +39,18 @@ import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; /** - * Action des simulations. + * Actions des simulations. * * @author poussin - * @version $Revision$ + * @version $Revision: 1862 $ * - * Last update: $Date$ - * by : $Author$ + * Last update: $Date: 2009-02-23 16:42:34 +0100 (lun. 23 févr. 2009) $ + * by : $Author: chatellier $ */ public class SimulationAction { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SimulationAction.class); + /** to use log facility, just put in your code: log.info("..."); */ + private static Log log = LogFactory.getLog(SimulationAction.class); protected IsisConfig config = null; @@ -82,9 +82,11 @@ if (!RegionStorage.exists(regionName)) { RegionStorage.importAndRenameZip(region, regionName); } else { - log.warn(_( + if (log.isWarnEnabled()) { + log.warn(_( "Region %s allready exist in repository. Can't import", regionName)); + } } } @@ -92,16 +94,35 @@ } /** + * Launch a simulation with specified simulationId and simulation zip. * - * @param simulId id de simulation + * @param simulationId id de simulation * @param simulationZip Zip de la simulation * @throws Exception */ - public static void simulateWithSimulation(String simulId, File simulationZip) + public static void simulateWithSimulation(String simulationId, File simulationZip) throws Exception { - log.info("id:" + simulId + ", zip:" + simulationZip); + // just call with null pre script + simulateWithSimulation(simulationId, simulationZip, null); + } + + /** + * Launch a simulation with specified simulationId, simulationZip + * and simulationPrescript. + * + * @param simulationId id de simulation + * @param simulationZip Zip de la simulation + * @param simulationPrescript simulation prescript + * @throws Exception + */ + public static void simulateWithSimulation(String simulationId, File simulationZip, String simulationPrescript) + throws Exception { + + if (log.isInfoEnabled()) { + log.info("Command line action : simulateWithSimulation (" + simulationId + ", " + simulationZip.getAbsolutePath() + ", " + simulationPrescript + ")"); + } - String name = simulId; // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); + String name = simulationId; // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); SimulationControl control = new SimulationControl(name); @@ -114,7 +135,8 @@ //SimulationStorage simulation = launcher.simulate(null, control, simulationZip); //simulation.getStorage().closeContext(); - launcher.simulate(null, control, simulationZip); + // FIXME simulation prescript to get from parameters !!! + launcher.simulate(null, control, simulationZip, null); SimulationStorage simulation = launcher.getSimulationStorage(SimulationService.getService(), control); simulation.getStorage().closeContext(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,7 +19,6 @@ package fr.ifremer.isisfish.actions; - import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; import fr.ifremer.isisfish.IsisConfig; @@ -32,10 +31,10 @@ /** * * @author poussin - * @version $Revision$ + * @version $Revision: 1862 $ * - * Last update: $Date$ - * by : $Author$ + * Last update: $Date: 2009-02-23 16:42:34 +0100 (lun. 23 févr. 2009) $ + * by : $Author: chatellier $ */ public class VCSAction { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -27,6 +27,8 @@ * @author chatellier * @version $Revision: 1.0 $ * + * @since 3.2.0.4 + * * Last update : $Date: 5 mars 2009 $ * By : $Author: chatellier $ */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,54 +17,39 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * AbstractRule.java - * - * Created: 12 janv. 2006 17:12:51 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.rule; import java.util.HashMap; import java.util.Map; -import java.util.Properties; -import org.apache.commons.beanutils.ConvertUtilsBean; -import org.codelutin.topia.persistence.TopiaEntity; - -import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.datastore.RuleStorage; -import fr.ifremer.isisfish.util.ConverterUtil; - - /** * Les parametres d'une regle sont tous les attributs prefixé de param, mais * ce prefix n'apparait que dans le code source. * + * Created: 12 janv. 2006 17:12:51 + * * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ - public abstract class AbstractRule implements Rule { - transient protected Map<String, Object> values = new HashMap<String, Object>(); + protected transient Map<String, Object> values = new HashMap<String, Object>(); - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.rule.Rule#getValue(java.lang.String) */ + @Override public Object getValue(String name) { return values.get(name); } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.rule.Rule#setValue(java.lang.String, java.lang.Object) */ + @Override public void setValue(String name, Object value) { values.put(name, value); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * Rule.java - * - * Created: 12 janv. 2006 17:02:43 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.rule; import fr.ifremer.isisfish.entities.Metier; @@ -54,7 +42,13 @@ * <p> Pour supporter d'autre type il faut créer des converters commons-beans * //@link fr.ifremer.isisfish.simulator.SimulationParameter#ruleParametertoProperties(Rule) * + * Created: 12 janv. 2006 17:02:43 + * * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ public interface Rule { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -50,13 +50,16 @@ * de simulation. Il est ensuite possible de lui demander ou en est rendu * une simulation. * + * FIXME chatellier : since ... a long time this implementation is unmaintained. + * * Created: Thu Aug 22 2002 * * @author <poussin at codelutin.com> Copyright Code Lutin * * @version $Revision$ * - * Mise a jour: $Date$ par : $Author$ + * Mise a jour: $Date$ + * par : $Author$ */ public class SimulatorServer implements XmlRpcHandler, XmlRpcHandlerMapping { // SimulatorServer @@ -173,7 +176,7 @@ simulationControls.put(id, control); try { SimulatorLauncher launcher = new InProcessSimulatorLauncher(); - launcher.simulate(null, control, zip); + launcher.simulate(null, control, zip, null); // FIXME null simulation = launcher.getSimulationStorage(null, control); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -64,13 +64,13 @@ import fr.ifremer.isisfish.types.Month; /** - * Fait une simulation dans la meme jvm + * Fait une simulation dans la meme jvm. * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class InProcessSimulatorLauncher implements SimulatorLauncher { @@ -80,12 +80,12 @@ protected SimulationStorage simulation; - /* - * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#simulate(fr.ifremer.isisfish.simulator.launcher.SimulationService, fr.ifremer.isisfish.simulator.SimulationControl, java.io.File) + /** + * {@inheritDoc} */ public void simulate(SimulationService simulationService, - SimulationControl control, File simulationZip) - throws RemoteException { + SimulationControl control, File simulationZip, + String simulationPrescript) throws RemoteException { String id = control.getId(); log.info(_("simulate %s with file %s", id, simulationZip)); @@ -99,6 +99,13 @@ control.setDate(new Date()); control.setProgress(0); control.setStarted(true); + + // replace prescript if specified on method + if (simulationPrescript != null && !simulationPrescript.trim().isEmpty()) { + param.setUsePreScript(true); + param.setPreScript(simulationPrescript); + } + int lastYear = param.getNumberOfYear(); int lastDate = lastYear * Month.NUMBER_OF_MONTH; control.setProgressMax(lastDate); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/IsisFishServerSimulationLauncher.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -39,12 +39,15 @@ import fr.ifremer.isisfish.simulator.SimulationControl; /** - * + * Launch simulation on remote IsisFish server throw XML-RPC. + * + * FIXME chatellier : since ... a long time this implementation is unmaintained. + * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class IsisFishServerSimulationLauncher implements SimulatorLauncher { @@ -53,8 +56,8 @@ .getLog(IsisFishServerSimulationLauncher.class); public void simulate(SimulationService simulationService, - SimulationControl control, File simulationZip) - throws RemoteException { + SimulationControl control, File simulationZip, + String simulationPreScript) throws RemoteException { String simulationId = control.getId(); SimulationStorage simulation = null; try { @@ -149,7 +152,7 @@ } /** - * This thread is responsable to synchronized SimulationControl used localy with + * This thread is responsible to synchronized SimulationControl used localy with * remote simulation control for remote simulation. * * This thread dead when {@link SimulationControl#isRunning()} is false @@ -205,8 +208,7 @@ xmlrpcconfig.setBasicPassword(IsisFish.config .getSimulatorPassword()); XmlRpcClient client = new XmlRpcClient(); - client - .setTransportFactory(new XmlRpcCommonsTransportFactory( + client.setTransportFactory(new XmlRpcCommonsTransportFactory( client)); client.setConfig(xmlrpcconfig); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -177,7 +177,7 @@ */ @Override public void simulate(SimulationService simulationService, - SimulationControl control, File simulationZip) + SimulationControl control, File simulationZip, String simulationPrescript) throws RemoteException { // start ssh session Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -41,10 +41,10 @@ * Il est aussi possible d'ecoute l'etat de l'attribut pause * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class SimulationExecutor extends ThreadPoolExecutor { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -19,44 +19,64 @@ package fr.ifremer.isisfish.simulator.launcher; +import java.io.File; + import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; -import java.io.File; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** - * Objet representant un simulation qui doit etre faite + * Objet representant un simulation qui doit etre faite. * + * Elle est composée : + * - d'un fichier zip (la simulation a simuler) + * - les parametres de la simulation + * - d'un pre-script + * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class SimulationItem { - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(SimulationItem.class); - - /** le control pour la simulation */ + /** Le control pour la simulation. */ protected SimulationControl control; + + /** Les parametres de simulation. */ protected SimulationParameter parameter; - /** le zip contenant la simulation prete a etre executee */ + + /** Le zip contenant la simulation prete a etre executee. */ protected File simulationZip; - public SimulationItem(SimulationControl control, SimulationParameter param, - File simulationZip) { + /** + * Constructor. + * + * @param control Le control pour la simulation. + * @param param Les parametres de simulation. + */ + public SimulationItem(SimulationControl control, SimulationParameter param) { this.control = control; this.parameter = param; - this.simulationZip = simulationZip; } - + + /** + * Retourne le control pour la simulation. + * @return le control pour la simulation. + */ public SimulationControl getControl() { return control; } /** + * Retorune les parametres de simulation. + * @return les parametres de simulation. + */ + public SimulationParameter getParameter() { + return parameter; + } + + /** * Permet de mettre le zip apres construction de l'objet. Cela est util * car la construction du zip prend du temps, et on souhaite pouvoir le * monitorer et donc il faut que l'item exist pour etre vu dans la console @@ -71,12 +91,12 @@ this.simulationZip = simulationZip; } - public SimulationParameter getParameter() { - return parameter; - } - + /** + * Retourne le zip contenant la simulation prete a etre executee. + * + * @return le zip contenant la simulation prete a etre executee. + */ public File getSimulationZip() { return simulationZip; } - } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -43,10 +43,10 @@ * {@link SimulationService#reportError}. * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class SimulationJob implements Runnable, Comparable<SimulationJob> { @@ -221,7 +221,14 @@ //SimulationStorage simulation = null; if (!onlyCheckControl) { File zip = item.getSimulationZip(); - launcher.simulate(simulationService, control, zip); + + // get prescript content, only if UsePreScript is set to true + String simulationPrescript = null; + if(param.getUsePreScript()) { + simulationPrescript = param.getPreScript(); + } + + launcher.simulate(simulationService, control, zip, simulationPrescript); } // simulation ended @@ -292,19 +299,22 @@ } /** - * Interface permettant d'implanter des actions a faire apres la simulation, - * Ces action ne se declenche pas pour les job de plan d'analyse pere + * Interface permettant d'implanter des actions a faire apres la simulation. + * Ces actions ne se declenchent pas pour les job de plan d'analyse pere. */ public static interface PostAction { + /** - * appeler lorsque la simulation s'arrete normalement + * Appelé lorsque la simulation s'arrete normalement. + * * @param job le job qui a fait la simulation * @param sim la simulation qui vient d'etre faite */ public void finished(SimulationJob job, SimulationStorage sim); /** - * appeler lorsque la simulation a echouee + * Appeler lorsque la simulation a echoué. + * * @param job le job qui a fait la simulation * @param eee l'exception qui a ete levee */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -58,6 +58,7 @@ * seulement celle dit simple, c'est-à-dire "master plan" du plan * d'analyse. * + * @since 3.2.0.4 * @author chatellier * @version $Revision: 1.0 $ * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -23,25 +23,21 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Multi tail PriorityBlockingQueue. * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class SimulationQueue extends JDKPriorityBlockingQueue<SimulationJob> { /** serialVersionUID. */ private static final long serialVersionUID = -6130030747211387382L; - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(SimulationQueue.class); protected SimulationQueue parent = null; protected List<SimulationQueue> childs = new LinkedList<SimulationQueue>(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -99,10 +99,10 @@ * Il est alors suspendu pour ne plus etre utilise pour les simulations. * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class SimulationService { @@ -361,7 +361,7 @@ SimulatorLauncher launcher, int priority) { // on l'ajoute tout de suite a la liste des simulations demandee SimulationControl control = new SimulationControl(id); - SimulationItem item = new SimulationItem(control, param, null); + SimulationItem item = new SimulationItem(control, param); SimulationJob job = new SimulationJob(this, item, priority); job.setLauncher(launcher); fireStartEvent(job); @@ -401,6 +401,15 @@ SensitivityScenarios sensitivityScenarios = sensitivitycalculator .compute(designPlan); + // on l'ajoute tout de suite a la liste des simulations demandee + // init with default "id" must been changed for designPlan + // simulation + SimulationControl controlJustForZip = new SimulationControl(id); + + // on construit le zip de la simulation + // in zip, there will be param "without" prescript + File zip = prepareSimulationZipFile(controlJustForZip, param, true); + // for each simulation, we neeed to launch a specific simulation // new simulation ids will be id + "_" + x // where x is a int starting at 0 @@ -408,6 +417,8 @@ for (Scenario scenario : sensitivityScenarios.getScenarios()) { // modify modification parameter + // subParam only convenient for add pre script + // for launcher SimulationParameter subParam = param.copy(); String preScriptContent = generatePreScript(scenario); subParam.setUsePreScript(true); @@ -415,20 +426,16 @@ // build new simulation id String subsimulationId = id + "_" + simulationIndex; - - // on l'ajoute tout de suite a la liste des simulations demandee - SimulationControl control = new SimulationControl( - subsimulationId); - SimulationItem item = new SimulationItem(control, subParam, - null); + SimulationControl realSimulationControl = new SimulationControl(subsimulationId); + + // new item, with zip + SimulationItem item = new SimulationItem(realSimulationControl, subParam); + item.setSimulationZip(zip); + SimulationJob job = new SimulationJob(this, item, priority); job.setLauncher(launcher); fireStartEvent(job); - // on construit le zip de la simulation - File zip = prepareSimulationZipFile(control, subParam, true); - item.setSimulationZip(zip); - if (subParam.getUseAnalysePlan() && subParam.isIndependentPlan()) { // c un plan d'analyse independant, on construit toute les sous simu @@ -466,7 +473,7 @@ configuration.setTemplateLoader(templateLoader); configuration.setObjectWrapper(new BeansWrapper()); - + return configuration; } @@ -474,7 +481,7 @@ * Generate prescript to set factor values before simulation start. * * @param scenario - * @return + * @return simulation pre script with correct values * @throws IOException if pre script can't be made * @throws TemplateException if pre script can't be made */ @@ -492,7 +499,7 @@ Map<String, Object> root = new HashMap<String, Object>(); root.put("scenario", scenario); root.put("beanUtils", ConverterUtil.getConverter(null)); - + template.process(root, out); out.flush(); String scriptContent = out.toString(); @@ -517,7 +524,7 @@ SimulatorLauncher launcher, int priority) { // on l'ajoute tout de suite a la liste des simulations demandee SimulationControl control = new SimulationControl(id); - SimulationItem item = new SimulationItem(control, param, null); + SimulationItem item = new SimulationItem(control, param); SimulationJob job = new SimulationJob(this, item, priority); job.setLauncher(launcher); fireStartEvent(job); @@ -722,7 +729,8 @@ simId); SimulationParameter childParam = param.copy(); SimulationItem item = new SimulationItem( - childControl, childParam, zip); + childControl, childParam); + item.setSimulationZip(zip); nextJob = new SimulationJob(simulationService, job, item, job.getPriority()); nextJob.setLauncher(job.getLauncher()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -20,31 +20,36 @@ package fr.ifremer.isisfish.simulator.launcher; /** - * + * Ecouteur sur les evenenements de changement + * d'états des simulations. + * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public interface SimulationServiceListener { /** - * Notifie start of simulation + * Notify start of simulation. + * * @param simService le simulation service qui a lance la simulation * @param job job that responsable to simulation */ public void simulationStart(SimulationService simService, SimulationJob job); /** - * Notifie end of simulation + * Notify end of simulation. + * * @param simService le simulation service qui a arrete la simulation * @param job job that responsable to simulation */ public void simulationStop(SimulationService simService, SimulationJob job); /** - * Previent que le simulation service a vide ca liste de simulation faites + * Previent que le simulation service a vide ca liste de simulation faites. + * * @param simService le simulation service dont la liste des jobs finis * a ete vide */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -43,10 +43,10 @@ * simulations * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class SimulationServiceTableModel extends AbstractTableModel { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -29,10 +29,10 @@ * comme plugin de simulation (CapArmor, SubProcess, ...) * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public interface SimulatorLauncher { @@ -52,7 +52,7 @@ * exception est levee. */ public void simulate(SimulationService simulationService, - SimulationControl control, File simulationZip) + SimulationControl control, File simulationZip, String simulationPrescript) throws RemoteException; /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-03-05 15:34:44 UTC (rev 1913) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2009-03-05 16:53:02 UTC (rev 1914) @@ -44,10 +44,10 @@ * @see Process * * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ */ public class SubProcessSimulationLauncher implements SimulatorLauncher { @@ -64,8 +64,8 @@ @Override public void simulate(SimulationService simulationService, - SimulationControl control, File simulationZip) - throws RemoteException { + SimulationControl control, File simulationZip, + String simulationPrescript) throws RemoteException { String simulationId = control.getId(); SimulationStorage simulation = null; try { @@ -205,7 +205,8 @@ public SimulationCheckpointExternalProcessThread( SimulationControl control, String simulationId, Process process) { if (log.isInfoEnabled()) { - log.info("Lancement du thread de surveillance des simulations externes"); + log + .info("Lancement du thread de surveillance des simulations externes"); } this.control = control; this.simulationId = simulationId; @@ -251,7 +252,7 @@ } } catch (IOException e) { if (log.isErrorEnabled()) { - log.error(_("isisfish.simulator.subprocess.readoutput.error"), + log.error( _("isisfish.simulator.subprocess.readoutput.error"), e); } }

1 0

r1913 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 05 Mar '09

05 Mar '09

Author: chatellier Date: 2009-03-05 15:34:44 +0000 (Thu, 05 Mar 2009) New Revision: 1913 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Clean code, remove unused private code Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-03-05 10:31:56 UTC (rev 1912) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-03-05 15:34:44 UTC (rev 1913) @@ -17,18 +17,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * ClassUtil.java - * - * Created: 12 janv. 2006 15:29:53 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.util; import static org.codelutin.i18n.I18n._; @@ -38,7 +26,6 @@ import java.io.PrintWriter; import java.lang.reflect.Method; import java.net.URL; -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -58,27 +45,24 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.JavaSourceStorage; - /** + * Compile helper used to compile Java code. + * + * JDK must be installed to use compilation. + * (JRE won't work). + * + * Created: 12 janv. 2006 15:29:53 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public class CompileHelper { - /** - * Logger for this class - */ + /** Logger for this class. */ private static final Log log = LogFactory.getLog(CompileHelper.class); - - /** path to the tools.jar library */ - private static File toolsjar; - /** compilation classloader that contains compiler (toolsjar) */ - private static ClassLoader loader; - /** method to use to compile java source */ - private static Method compileMethod; - /** method to use to compile java source and that redirect output to specific stream */ - private static Method compileMethodWithPrintStream; /** * Recherche tous les fichiers qui un source plus recent que la version compilé. @@ -87,9 +71,9 @@ * @param destDir * @return File list */ - static public List<File> searchSrcToCompile(File srcDir, File destDir) { + public static List<File> searchSrcToCompile(File srcDir, File destDir) { List<File> result = new ArrayList<File>(); - for(File src : srcDir.listFiles()) { + for (File src : srcDir.listFiles()) { File dest = new File(FileUtil.basename(src, ".java"), ".class"); if (src.getName().endsWith(".java") && FileUtil.isNewer(src, dest)) { result.add(src); @@ -97,13 +81,13 @@ } return result; } - + /** * Load la class demandé * @param fqn le nom complet de la classe a charger * @return la classe souhaité ou null si la class n'est pas trouvée */ - static public Class loadClass(String fqn) { + public static Class loadClass(String fqn) { Class result = null; try { ClassLoader cl = IsisFish.config.getScriptClassLoader(); @@ -113,21 +97,21 @@ } return result; } - - static public Object newInstance(String fqn) { + + public static Object newInstance(String fqn) { Object result = null; try { Class clazz = loadClass(fqn); if (clazz != null) { result = clazz.newInstance(); - } - } catch(Exception eee) { + } + } catch (Exception eee) { log.warn(_("isisfish.error.instanciate", fqn), eee); } return result; } - + /** * Compile le fichier source en .class si le source est plus recent que * le .class @@ -140,15 +124,18 @@ * utilisées. * @return 0 si la compilation a reussi une autre valeur sinon */ - static public int compile(JavaSourceStorage source, File destDir, boolean force, PrintWriter out) { + public static int compile(JavaSourceStorage source, File destDir, + boolean force, PrintWriter out) { File src = source.getFile(); - File dst = new File(destDir, source.getFQN().replace('.', File.separatorChar) + ".class"); + File dst = new File(destDir, source.getFQN().replace('.', + File.separatorChar) + + ".class"); if (force || FileUtil.isNewer(src, dst)) { return CompileHelper.compile(source.getRoot(), src, destDir, out); } return 0; } - + /** * Methode permettant de compiler un script, une regle ou un export * @param rootSrc le répertoire ou se trouve les sources @@ -163,17 +150,18 @@ * <li> -10000 si une autre exception * <li> sinon les valeurs retourné par le compilateur java */ - static public int compile(File rootSrc, File src, File dest, PrintWriter out) { + public static int compile(File rootSrc, File src, File dest, PrintWriter out) { int result = compile(rootSrc, Collections.singletonList(src), dest, out); return result; } - - static public int compile(File rootSrc, Collection<File> src, File dest, PrintWriter out) { + + public static int compile(File rootSrc, Collection<File> src, File dest, + PrintWriter out) { int result = -10000; - try { + try { List<File> classpath = new ArrayList<File>(); classpath.add(rootSrc.getAbsoluteFile()); - + result = compile(classpath, src, dest, out); } catch (Exception eee) { if (log.isWarnEnabled()) { @@ -182,23 +170,25 @@ } return result; } - - + /** * Compile un fichier java * @param src les fichiers java source * @param dest le repertoire destination */ - static protected int compile(List<File> classpath, Collection<File> src, File dest, PrintWriter out) { + protected static int compile(List<File> classpath, Collection<File> src, + File dest, PrintWriter out) { dest.mkdirs(); - + int result = -1000; try { //JavaCompiler compiler = JavacTool.create(); // Use system compiler JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); - StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null); - Iterable<? extends JavaFileObject> compilationUnits = fileManager.getJavaFileObjectsFromFiles(src); + StandardJavaFileManager fileManager = compiler + .getStandardFileManager(null, null, null); + Iterable<? extends JavaFileObject> compilationUnits = fileManager + .getJavaFileObjectsFromFiles(src); // Options de compilations String classpathAsString = getClassPathAsString(classpath); @@ -208,12 +198,13 @@ args.add(classpathAsString); args.add("-d"); args.add(dest.getAbsolutePath()); - + // Compilation - boolean b = compiler.getTask(out, fileManager, null, args, null, compilationUnits).call(); + boolean b = compiler.getTask(out, fileManager, null, args, null, + compilationUnits).call(); // on retourne 0 si tout s'est bien déroulé et -1 sinon - result = b?0:-1; - + result = b ? 0 : -1; + fileManager.close(); } catch (Exception eee) { if (log.isWarnEnabled()) { @@ -222,34 +213,38 @@ } return result; } - + /** * @return */ - private static String getClassPathAsString(List<File> classpath) throws Exception { - String result = StringUtils.join(classpath.iterator(), File.pathSeparator) + - File.pathSeparator + System.getProperty("java.class.path"); + private static String getClassPathAsString(List<File> classpath) + throws Exception { + String result = StringUtils.join(classpath.iterator(), + File.pathSeparator) + + File.pathSeparator + System.getProperty("java.class.path"); // Ajout des jars - for (Enumeration<?> e = CompileHelper.class.getClassLoader().getResources("META-INF/MANIFEST.MF"); e.hasMoreElements();) { + for (Enumeration<?> e = CompileHelper.class.getClassLoader() + .getResources("META-INF/MANIFEST.MF"); e.hasMoreElements();) { URL url = (URL) e.nextElement(); if ((url != null) && url.getFile().startsWith("file:/")) { - String jarName = url.getPath().substring(5, url.getPath().indexOf("!")); - if(!result.contains(jarName)) { + String jarName = url.getPath().substring(5, + url.getPath().indexOf("!")); + if (!result.contains(jarName)) { result += File.pathSeparator + jarName; } } } - + // FIXME just for test to run in maven // In this case, current project in not packaged ad jar // and no META-INF/MANIFEST.MF could be found... - File targetClassesFile = new File("target","classes"); + File targetClassesFile = new File("target", "classes"); if (targetClassesFile.isDirectory()) { result += File.pathSeparator + targetClassesFile.getAbsolutePath(); } - if(log.isDebugEnabled()) { + if (log.isDebugEnabled()) { log.debug("CLASSPATH : " + result); } @@ -257,70 +252,45 @@ } /** - * @return - */ - private static File getToolsJar() { - if (toolsjar == null) { - File javaHome = new File(System.getProperty("java.home")).getParentFile(); - log.debug("javaHome " + javaHome); - List<File> tools = FileUtil.find(javaHome, ".*tools.jar", true); - - if (tools.size() > 0) { - toolsjar = tools.get(0); - log.debug("tools.jar -> " + toolsjar); - } - } - return toolsjar; - } - - - private static class CompilerClassLoader extends URLClassLoader { - - public CompilerClassLoader(URL [] url, ClassLoader parent) { - super(url, parent); - } - - } - - /** * Extract documentation from interface (Equation) * @param category * @param name * @param javaInterface * @return doc */ - static public String extractDoc(String category, String name, Class javaInterface) { + public static String extractDoc(String category, String name, + Class javaInterface) { String content = ""; - content = "<p>Equation : " + createHREF(javaInterface.getName(), category) + " - " + name + "</p>"; + content = "<p>Equation : " + + createHREF(javaInterface.getName(), category) + " - " + name + + "</p>"; content += "<h3>Parameter: name and type</h3>"; - - if (javaInterface != null) { - Method [] methods = javaInterface.getDeclaredMethods(); - Method interfaceMethod = methods[0]; - - Args args = interfaceMethod.getAnnotation(Args.class); - String [] names = args.value(); - - String [] stringTypes = null; - ArgTypes argTypes = interfaceMethod.getAnnotation(ArgTypes.class); - if (argTypes != null) { - stringTypes = argTypes.value(); - } else { - stringTypes = new String[names.length]; - Class [] types = interfaceMethod.getParameterTypes(); - for (int i=0; i<types.length; i++) { - stringTypes[i] = types[i].getName(); - } + + Method[] methods = javaInterface.getDeclaredMethods(); + Method interfaceMethod = methods[0]; + + Args args = interfaceMethod.getAnnotation(Args.class); + String[] names = args.value(); + + String[] stringTypes = null; + ArgTypes argTypes = interfaceMethod.getAnnotation(ArgTypes.class); + if (argTypes != null) { + stringTypes = argTypes.value(); + } else { + stringTypes = new String[names.length]; + Class[] types = interfaceMethod.getParameterTypes(); + for (int i = 0; i < types.length; i++) { + stringTypes[i] = types[i].getName(); } - - for (int i=0; i<names.length; i++) { - content += "<li>" + names[i] + " : " + createHREF(stringTypes[i]); -// if (i+1<names.length) { -// content += "\n"; -// } - } - } + + for (int i = 0; i < names.length; i++) { + content += "<li>" + names[i] + " : " + createHREF(stringTypes[i]); + // if (i+1<names.length) { + // content += "\n"; + // } + } + try { FileUtil.writeString(new File("/tmp/testDoc.html"), content); } catch (IOException eee) { @@ -330,16 +300,15 @@ } return content; } - - static private String createHREF(String type, String ... texts) { - String ref = IsisFish.config.getJavadocURL() + type.replaceAll("\\.", "/") + ".html"; + + private static String createHREF(String type, String... texts) { + String ref = IsisFish.config.getJavadocURL() + + type.replaceAll("\\.", "/") + ".html"; String text = type; if (texts.length > 0) { text = texts[0]; } - String result = "<a href='"+ref+"'>" + text + "</a>"; + String result = "<a href='" + ref + "'>" + text + "</a>"; return result; } } - -

1 0

r1912 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish main/java/fr/ifremer/isisfish/mexico main/java/fr/ifremer/isisfish/mexico/xml main/java/fr/ifremer/isisfish/simulator/sensitivity main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor test/java/fr/ifremer/isisfish test/java/fr/ifremer/isisfish/mexico test/java/fr/ifremer/isisfish/simulator test/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 05 Mar '09

05 Mar '09

Author: chatellier Date: 2009-03-05 10:31:56 +0000 (Thu, 05 Mar 2009) New Revision: 1912 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java Log: Begin to add visitors on sensitivity classes and Mexico XML export. Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -0,0 +1,49 @@ +/* *##% + * Copyright (C) 2009 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.ifremer.isisfish.mexico; + +import fr.ifremer.isisfish.mexico.xml.DesignPlanXMLVisitor; +import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; + +/** + * Mexico helper class. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public class MexicoHelper { + + /** + * Get xml representation of a design plan. + * + * @param designPlan design plan + * @return xml design plan representation + */ + public static String getDesignPlanAsXML(DesignPlan designPlan) { + + DesignPlanXMLVisitor visitor = new DesignPlanXMLVisitor(); + designPlan.accept(visitor); + String designPlanXml = visitor.getXML(); + return designPlanXml; + + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -0,0 +1,87 @@ +/* *##% + * Copyright (C) 2009 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.ifremer.isisfish.mexico.xml; + +import java.io.Serializable; + +import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DesignPlanVisitor; + +/** + * XML design plan visitor. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public class DesignPlanXMLVisitor implements DesignPlanVisitor { + + /** XML text buffer. */ + protected StringBuffer xmlBuffer; + + /** + * Constructor. + * + * Init xml buffer. + */ + public DesignPlanXMLVisitor() { + xmlBuffer = new StringBuffer(); + } + + /** + * Get xml buffer content. + * + * @return content as string + */ + public String getXML() { + String xml = xmlBuffer.toString(); + return xml; + } + + /** + * {@inheritDoc} + */ + @Override + public void start(DesignPlan designPlan) { + xmlBuffer.append("<designplan>"); + } + + /** + * {@inheritDoc} + */ + @Override + public void visit(DesignPlan designPlan, + Factor<? extends Serializable> factor) { + FactorXMLVisitor visitor = new FactorXMLVisitor(); + factor.accept(visitor); + xmlBuffer.append(visitor.getXML()); + } + + /** + * {@inheritDoc} + */ + @Override + public void end(DesignPlan designPlan) { + xmlBuffer.append("</designplan>"); + } + +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -0,0 +1,94 @@ +/* *##% + * Copyright (C) 2009 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.ifremer.isisfish.mexico.xml; + +import java.io.Serializable; + +import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; + +/** + * XML domain visitor. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public class DomainXMLVisitor implements DomainVisitor { + + /** XML text buffer. */ + protected StringBuffer xmlBuffer; + + /** + * Constructor. + * + * Init xml buffer. + */ + public DomainXMLVisitor() { + xmlBuffer = new StringBuffer(); + } + + /** + * Get xml buffer content. + * + * @return content as string + */ + public String getXML() { + String xml = xmlBuffer.toString(); + return xml; + } + + /** + * {@inheritDoc} + */ + @Override + public void start(Domain<? extends Serializable> domain) { + xmlBuffer.append("<domain "); + if (domain instanceof ContinuousDomain) { + xmlBuffer.append("type=\"continous\""); + } + if (domain instanceof DiscreteDomain) { + xmlBuffer.append("type=\"discrete\""); + } + xmlBuffer.append(">"); + } + + /** + * {@inheritDoc} + */ + @Override + public <E extends Serializable> void visit(Domain<E> domain, + Serializable label, E value) { + xmlBuffer.append("<value label=\"" + label + "\">"); + xmlBuffer.append(value); + xmlBuffer.append("</value>"); + } + + /** + * {@inheritDoc} + */ + @Override + public void end(Domain<? extends Serializable> domain) { + xmlBuffer.append("</domain>"); + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -0,0 +1,93 @@ +/* *##% + * Copyright (C) 2009 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.ifremer.isisfish.mexico.xml; + +import java.io.Serializable; + +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; + +/** + * XML factor visitor. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public class FactorXMLVisitor implements FactorVisitor { + + /** XML text buffer. */ + protected StringBuffer xmlBuffer; + + /** + * Constructor. + * + * Init xml buffer. + */ + public FactorXMLVisitor() { + xmlBuffer = new StringBuffer(); + } + + /** + * Get xml buffer content. + * + * @return content as string + */ + public String getXML() { + String xml = xmlBuffer.toString(); + return xml; + } + + /* + * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#start(fr.ifremer.isisfish.simulator.sensitivity.Factor) + */ + @Override + public void start(Factor<? extends Serializable> factor) { + xmlBuffer.append("<factor"); + xmlBuffer.append(" name=\"" + factor.getName() + "\""); + xmlBuffer.append(" path=\"" + factor.getPath() + "\""); + if (factor.getValue() != null) { + xmlBuffer.append(" value=\"" + factor.getValue() + "\""); + } + xmlBuffer.append(">"); + } + + /* + * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#visit(fr.ifremer.isisfish.simulator.sensitivity.Domain) + */ + @Override + public void visit(Factor<? extends Serializable> factor, Domain<? extends Serializable> domain) { + DomainXMLVisitor visitor = new DomainXMLVisitor(); + domain.accept(visitor); + xmlBuffer.append(visitor.getXML()); + } + + /* + * @see fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor#end(fr.ifremer.isisfish.simulator.sensitivity.Factor) + */ + @Override + public void end(Factor<? extends Serializable> factor) { + xmlBuffer.append("</factor>"); + + } + +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java 2009-03-04 18:21:15 UTC (rev 1911) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/ContinuousDomain.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -22,6 +22,8 @@ import org.apache.commons.lang.builder.ToStringBuilder; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; + /** * Domaine continu. * @@ -102,6 +104,18 @@ // FIXME test cast return (E)identifier; } + + /** + * Accept a new visitor. + * + * @param visitor + */ + public void accept(DomainVisitor visitor) { + visitor.start(this); + visitor.visit(this, "min", minBound); + visitor.visit(this, "max", maxBound); + visitor.end(this); + } /* * @see java.lang.Object#toString() Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2009-03-04 18:21:15 UTC (rev 1911) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -24,6 +24,8 @@ import org.apache.commons.lang.builder.ToStringBuilder; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DesignPlanVisitor; + /** * Design plan contenant toutes les * valeur de facteur possible. @@ -67,6 +69,19 @@ this.factors = factors; } + /** + * Accept a new visitor. + * + * @param visitor + */ + public void accept(DesignPlanVisitor visitor) { + visitor.start(this); + for(Factor<? extends Serializable> factor : factors) { + visitor.visit(this, factor); + } + visitor.end(this); + } + /* * @see java.lang.Object#toString() */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java 2009-03-04 18:21:15 UTC (rev 1911) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DiscreteDomain.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -19,11 +19,14 @@ package fr.ifremer.isisfish.simulator.sensitivity; import java.io.Serializable; +import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; import org.apache.commons.lang.builder.ToStringBuilder; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; + /** * Domain discret. * @@ -88,6 +91,19 @@ return values.get(identifier); } + /** + * Accept a new visitor. + * + * @param visitor + */ + public void accept(DomainVisitor visitor) { + visitor.start(this); + for(Map.Entry<Serializable, E> value : values.entrySet()) { + visitor.visit(this, value.getKey(), value.getValue()); + } + visitor.end(this); + } + /* * @see java.lang.Object#toString() */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2009-03-04 18:21:15 UTC (rev 1911) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -20,6 +20,8 @@ import java.io.Serializable; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.DomainVisitor; + /** * Domaine du facteur. * @@ -50,4 +52,11 @@ * @return found value or <tt>null</tt> if not found */ E getValueForIdentifier(Serializable identifier); + + /** + * Accept a new visitor. + * + * @param visitor + */ + public void accept(DomainVisitor visitor); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-04 18:21:15 UTC (rev 1911) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -22,6 +22,8 @@ import org.apache.commons.lang.builder.ToStringBuilder; +import fr.ifremer.isisfish.simulator.sensitivity.visitor.FactorVisitor; + /** * Facteur de variation des parametres de simulation. * @@ -179,6 +181,17 @@ } /** + * Accept a new visitor. + * + * @param visitor + */ + public void accept(FactorVisitor visitor) { + visitor.start(this); + visitor.visit(this, domain); + visitor.end(this); + } + + /** * {@inheritDoc} */ @Override Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -0,0 +1,58 @@ +/* *##% + * Copyright (C) 2009 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.ifremer.isisfish.simulator.sensitivity.visitor; + +import java.io.Serializable; + +import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; + +/** + * DesignPlan visitor. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public interface DesignPlanVisitor { + + /** + * Start. + * + * @param designPlan design plan + */ + void start(DesignPlan designPlan); + + /** + * Visit factor. + * + * @param designPlan design plan + * @param factor factor + */ + void visit(DesignPlan designPlan, Factor<? extends Serializable> factor); + + /** + * End. + * + * @param designPlan design plan + */ + void end(DesignPlan designPlan); +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -0,0 +1,59 @@ +/* *##% + * Copyright (C) 2009 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.ifremer.isisfish.simulator.sensitivity.visitor; + +import java.io.Serializable; + +import fr.ifremer.isisfish.simulator.sensitivity.Domain; + +/** + * Domain visitor. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public interface DomainVisitor { + + /** + * Start. + * + * @param domain domain + */ + void start(Domain<? extends Serializable> domain); + + /** + * Visit domain value or property. + * + * @param <E> domain element type + * @param domain domain + * @param label value label or property name + * @param value value + */ + <E extends Serializable> void visit(Domain<E> domain, Serializable label, E value); + + /** + * End. + * + * @param domain domain + */ + void end(Domain<? extends Serializable> domain); +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -0,0 +1,58 @@ +/* *##% + * Copyright (C) 2009 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.ifremer.isisfish.simulator.sensitivity.visitor; + +import java.io.Serializable; + +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; + +/** + * Factor visitor. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public interface FactorVisitor { + + /** + * Start. + * + * @param factor factor + */ + void start(Factor<? extends Serializable> factor); + + /** + * Visit domain. + * + * @param factor factor + * @param domain domain + */ + void visit(Factor<? extends Serializable> factor, Domain<? extends Serializable> domain); + + /** + * End. + * + * @param factor factor + */ + void end(Factor<? extends Serializable> factor); +} Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -0,0 +1,96 @@ +/* *##% + * Copyright (C) 2009 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.ifremer.isisfish.mexico; + +import junit.framework.Assert; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; + +import fr.ifremer.isisfish.simulator.sensitivity.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; +import fr.ifremer.isisfish.simulator.sensitivity.DiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; + +/** + * TODO COMMENT ME. + * + * @author chatellier + * @version $Revision: 1.0 $ + * + * Last update : $Date: 5 mars 2009 $ + * By : $Author: chatellier $ + */ +public class MexicoHelperTest { + + /** Commons logging log. */ + private static Log log = LogFactory.getLog(MexicoHelperTest.class); + + /** + * Test method {@link MexicoHelper#getDesignPlanAsXML(DesignPlan)}. + */ + @Test + public void testGetDesignPlanAsXML() { + + DesignPlan designPlan = new DesignPlan(); + + // factor 1 + Factor<Double> factor1 = new Factor<Double>("factor 1 (double)"); + ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>(); + domain1.setMinBound(0.0); + domain1.setMaxBound(50.0); + factor1.setDomain(domain1); + factor1.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength"); + + // factor 2 + Factor<Double> factor2 = new Factor<Double>("factor 2 (double)"); + DiscreteDomain<Double> domain2 = new DiscreteDomain<Double>(); + domain2.getValues().put(0.0, 12.3); + domain2.getValues().put(1.0, 70.9); + domain2.getValues().put(2.0, 21.0); + domain2.getValues().put(3.0, -12.1); + domain2.getValues().put(4.0, -8.45); + factor2.setDomain(domain2); + factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength"); + factor2.setValue(3.0); + + // factor 3 + Factor<Double> factor3 = new Factor<Double>("factor 3 (double)"); + ContinuousDomain<Double> domain3 = new ContinuousDomain<Double>(); + domain3.setMinBound(12.0); + domain3.setMaxBound(99.0); + factor3.setDomain(domain3); + factor3.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); + + designPlan.getFactors().add(factor1); + designPlan.getFactors().add(factor2); + designPlan.getFactors().add(factor3); + + // test xml export + String xml = MexicoHelper.getDesignPlanAsXML(designPlan); + Assert.assertTrue(xml.indexOf("<factor name=\"factor 2 (double)\"") != -1); + Assert.assertTrue(xml.indexOf("<value label=\"0.0\">12.3</value>") != -1); + Assert.assertTrue(xml.indexOf("<value label=\"min\">12.0</value>") != -1); + + if (log.isInfoEnabled()) { + log.info("Designplan xml = " + xml); + } + } +} Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-03-04 18:21:15 UTC (rev 1911) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationHelperTest.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -52,7 +52,8 @@ */ public class SimulationHelperTest { - private static final Log log = LogFactory.getLog(SimulationHelperTest.class); + /** Commons logging log. */ + private static Log log = LogFactory.getLog(SimulationHelperTest.class); final static private String[] SIMULATION_ZIP_FILE = new String[]{ "src" + File.separator + "test" + File.separator + "resources" + File.separator + "simulations" + File.separator + "test-nonregression-20090203.zip", Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-04 18:21:15 UTC (rev 1911) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -38,7 +38,6 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import fr.ifremer.TestUtils; @@ -75,7 +74,8 @@ */ public class SimulationPreScriptTest { - private static final Log log = LogFactory.getLog(SimulationPreScriptTest.class); + /** Commons logging log. */ + private static Log log = LogFactory.getLog(SimulationPreScriptTest.class); //protected TopiaContext rootContext; Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-04 18:21:15 UTC (rev 1911) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-05 10:31:56 UTC (rev 1912) @@ -55,7 +55,8 @@ */ public class SimulationServiceTest { - private static final Log log = LogFactory.getLog(SimulationServiceTest.class); + /** Commons logging log. */ + private static Log log = LogFactory.getLog(SimulationServiceTest.class); @Before public void setUp() throws Exception {

1 0

r1911 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by sletellier＠users.labs.libre-entreprise.org 04 Mar '09

04 Mar '09

Author: sletellier Date: 2009-03-04 18:21:15 +0000 (Wed, 04 Mar 2009) New Revision: 1911 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java Log: Sensitivity work with tabs Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-04 18:21:15 UTC (rev 1911) @@ -39,11 +39,17 @@ <script><![CDATA[ import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; + +getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); public void refresh() { - gearTab.removeChangeListener(getTabListener()); - gearTab.addChangeListener(getTabListener()); + if (isSens()){ + gearTab.addChangeListener(new SensitivityTabbedPaneListener()); + } else { + gearTab.addChangeListener(new InputTabbedPaneListener()); + } getVerifier().addCurrentPanel(selectivityUI ,gearTabUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-04 18:21:15 UTC (rev 1911) @@ -2,6 +2,8 @@  <Boolean id='actif' javaBean='false'/> + + <Boolean id='sens' javaBean='false'/>  <java.lang.String id='buttonTitle' javaBean='""'/> @@ -31,14 +33,6 @@ import fr.ifremer.isisfish.ui.sensitivity.FactorWizard; import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; -protected ChangeListener tabListener = null; - -public ChangeListener getTabListener(){ - return tabListener; -} -public void setTabListener(ChangeListener l){ - this.tabListener = l; -} public void refresh(){} public InputAction getAction() { return getContextValue(InputAction.class); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-03-04 18:21:15 UTC (rev 1911) @@ -95,7 +95,7 @@ // apply refresh method (should a contract for all this ui with a method refresh...) try { currentUI = (InputContentUI) newUI; - currentUI.setTabListener(new InputTabbedPaneListener()); + currentUI.setSens(false); context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentNode = node; } catch (Exception e) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-03-04 18:21:15 UTC (rev 1911) @@ -6,6 +6,7 @@ package fr.ifremer.isisfish.ui.input; import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; import fr.ifremer.isisfish.ui.widget.ErrorDialogUI; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -308,6 +309,10 @@ for (InputContentUI ui : panels){ editable = !currentEntities.isEmpty(); this.currentPanels.add(ui); + if (rootUI == null){ + ui.setSens(true); + ui.setLayer(true); + } ui.refresh(); ui.setActif(editable); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-04 18:21:15 UTC (rev 1911) @@ -40,11 +40,17 @@ import fr.ifremer.isisfish.entities.TripType; import fr.ifremer.isisfish.entities.MetierImpl; import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); -metierTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { + if (isSens()){ + metierTab.addChangeListener(new SensitivityTabbedPaneListener()); + } else { + metierTab.addChangeListener(new InputTabbedPaneListener()); + } getVerifier().addCurrentPanel(metierSeasonSpeciesUI, metierSeasonInfoUI, metierTabUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-04 18:21:15 UTC (rev 1911) @@ -45,12 +45,17 @@ import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; +import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); public void refresh(){ - populationTab.removeChangeListener(getTabListener()); - populationTab.addChangeListener(getTabListener()); + if (isSens()){ + populationTab.addChangeListener(new SensitivityTabbedPaneListener()); + } else { + populationTab.addChangeListener(new InputTabbedPaneListener()); + } getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-03-04 18:21:15 UTC (rev 1911) @@ -39,11 +39,18 @@ <script><![CDATA[ +import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; + setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); + +getVerifier().addCurrentPanel(this); public void refresh() { - setOfVesselsTab.removeChangeListener(getTabListener()); - setOfVesselsTab.addChangeListener(getTabListener()); + if (isSens()){ + setOfVesselsTab.addChangeListener(new SensitivityTabbedPaneListener()); + } else { + setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); + } getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-03-04 18:21:15 UTC (rev 1911) @@ -36,10 +36,15 @@ +--> <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ +import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +getVerifier().addCurrentPanel(this); public void refresh() { - strategyTab.removeChangeListener(getTabListener()); - strategyTab.addChangeListener(getTabListener()); + if (isSens()){ + strategyTab.addChangeListener(new SensitivityTabbedPaneListener()); + } else { + strategyTab.addChangeListener(new InputTabbedPaneListener()); + } getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-03-04 18:21:15 UTC (rev 1911) @@ -98,7 +98,7 @@ try { currentUI = (InputContentUI) newUI; if (currentUI != null){ - currentUI.setTabListener(new SensitivityTabbedPaneListener()); + currentUI.setSens(true); context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentUI.setLayer(true); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-03-04 17:36:39 UTC (rev 1910) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-03-04 18:21:15 UTC (rev 1911) @@ -36,6 +36,7 @@ pane.setSelectedIndex(selectedIndex); } ui = (InputContentUI) pane.getSelectedComponent(); + ui.setSens(true); ui.setLayer(true); ui.refresh(); cacheSelectedIndex = pane.getSelectedIndex();

1 0

r1910 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/sensitivity java/fr/ifremer/isisfish/ui/simulator java/fr/ifremer/isisfish/ui/util resources/i18n
by sletellier＠users.labs.libre-entreprise.org 04 Mar '09

04 Mar '09

Author: sletellier Date: 2009-03-04 17:36:39 +0000 (Wed, 04 Mar 2009) New Revision: 1910 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Ajout de FactorWizard Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -133,7 +133,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed' - _bean='{getBean()}' _method='"Name"' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> + _bean='{CellImpl.class}' _method='"Name"' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -41,8 +41,9 @@ import fr.ifremer.isisfish.entities.Metier; setButtonTitle(_("isisfish.input.continueMetiers")); setNextPath("$root/$metiers"); -gearTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { + gearTab.removeChangeListener(getTabListener()); + gearTab.addChangeListener(getTabListener()); getVerifier().addCurrentPanel(selectivityUI ,gearTabUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -28,7 +28,17 @@ import java.lang.reflect.Method; import org.apache.commons.beanutils.MethodUtils; import fr.ifremer.isisfish.ui.util.UtilsUI; +import fr.ifremer.isisfish.ui.sensitivity.FactorWizard; +import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; +protected ChangeListener tabListener = null; + +public ChangeListener getTabListener(){ + return tabListener; +} +public void setTabListener(ChangeListener l){ + this.tabListener = l; +} public void refresh(){} public InputAction getAction() { return getContextValue(InputAction.class); @@ -56,7 +66,7 @@ boolean isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; - ui.setUseIcon(isSensitivity); + ui.setUseIcon(isSensitivity && isActif()); SwingUtil.getLayer(boxed).setUI(ui); } } @@ -65,25 +75,13 @@ protected void accept(ActionEvent e) { JComponent source = (JComponent) e.getSource(); + FactorWizard wizard = new FactorWizard(this); Class classBean = (Class)source.getClientProperty("bean"); - String method = (String)source.getClientProperty("method"); - - System.out.println("bean : " + classBean); - System.out.println("method : " + method); - System.out.println("in Properies : " + UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method)); - Object result = null; - try { - if (classBean != null && method != null){ - TopiaEntity bean = getVerifier().getEntity(classBean); - - Method m = bean.getClass().getMethod("get" + method, null); - result = m.invoke(bean, (Object[])null); - } - } catch (Exception ex) { - System.out.println(ex); - } - System.out.println("result : " + result); + TopiaEntity bean = getVerifier().getEntity(classBean); + wizard.init(source, bean, EditorHelper.canBeContinue(source, bean)); + wizard.pack(); + wizard.setVisible(true); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -95,6 +95,7 @@ // apply refresh method (should a contract for all this ui with a method refresh...) try { currentUI = (InputContentUI) newUI; + currentUI.setTabListener(new InputTabbedPaneListener()); context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentNode = node; } catch (Exception e) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -17,8 +17,7 @@ */ public class InputTabbedPaneListener implements ChangeListener{ protected int cacheSelectedIndex = -1; - - + @Override public void stateChanged(ChangeEvent e) { try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -48,8 +48,9 @@ setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); -populationTab.addChangeListener(new InputTabbedPaneListener()); public void refresh(){ + populationTab.removeChangeListener(getTabListener()); + populationTab.addChangeListener(getTabListener()); getVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -41,8 +41,9 @@ setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); -setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { + setOfVesselsTab.removeChangeListener(getTabListener()); + setOfVesselsTab.addChangeListener(getTabListener()); getVerifier().addCurrentPanel(effortDescriptionUI, setOfVesselsTabsUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -37,8 +37,9 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> <script><![CDATA[ -strategyTab.addChangeListener(new InputTabbedPaneListener()); public void refresh() { + strategyTab.removeChangeListener(getTabListener()); + strategyTab.addChangeListener(getTabListener()); getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); } ]]></script> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -13,6 +13,7 @@ import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; +import javax.swing.JList; import javax.swing.JRadioButton; import javax.swing.JTable; import javax.swing.JTextField; @@ -28,21 +29,20 @@ */ public class EditorHelper { - public JComponent getEditor(JComponent c) { + public static JComponent getEditor(JComponent c, TopiaEntity e) { JComponent result = null; try { - TopiaEntity e = (TopiaEntity) c.getClientProperty("bean"); - String fieldName = (String) c.getClientProperty("fieldName"); +// TopiaEntity e = (TopiaEntity) c.getClientProperty("bean"); + String fieldName = (String) c.getClientProperty("method"); result = c.getClass().newInstance(); if (result instanceof JTextField) { - ((JTextComponent) result).setText(BeanUtils.getProperty(e, fieldName)); + ((JTextComponent) result).setText(String.valueOf(callMethod(e, fieldName))); } else if (result instanceof JTable){ // ((JTable) result).setText(BeanUtils.getProperty(e, fieldName)); } else if (result instanceof MatrixPanelEditor){ - ((MatrixPanelEditor) result).setMatrix((MatrixND)callMethod(e, fieldName)); } else if (result instanceof JComboBox){ @@ -67,7 +67,7 @@ return result; } - public Object getValue(JComponent c) { + public static Object getValue(JComponent c) { Object result = null; if (result instanceof JTextComponent) { result = ((JTextComponent)result).getText(); @@ -80,6 +80,9 @@ } else if (result instanceof JComboBox){ // ((JComboBox) result).setModel(BeanUtils.getProperty(e, fieldName)); + } else if (result instanceof JList){ +// ((JComboBox) result).setModel(BeanUtils.getProperty(e, fieldName)); + } else if (result instanceof JCheckBox){ result = ((JCheckBox)result).isSelected(); @@ -96,8 +99,20 @@ return result; } - - protected Object callMethod(TopiaEntity e, String fieldName){ + public static boolean canBeContinue(JComponent c, TopiaEntity e){ + String fieldName = (String) c.getClientProperty("method"); + if (c instanceof JTextComponent) { + Object o = callMethod(e, fieldName); + System.out.println(o + " " + o.getClass()); + if (Integer.class.isInstance(o)){ + return true; + } else if (Double.class.isInstance(o)){ + return true; + } + } + return false; + } + protected static Object callMethod(TopiaEntity e, String fieldName){ Object result = null; try { Method m = e.getClass().getMethod("get" + fieldName, null); Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -0,0 +1,18 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui.sensitivity; + +import fr.ifremer.isisfish.datastore.SensitivityStorage; + +/** + * + * @author letellier + */ +public class FactorAction { + public void save(){ + + } +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -0,0 +1,128 @@ + +<JDialog id="FactorTypeChooser" title='isisfish.factor.title' resizable='false' modal='true' layout='{new BorderLayout()}'> + + <Boolean id='continuePossible' javaBean='true'/> + + <Boolean id='continueSelected' javaBean='false'/> + + <Boolean id='tabVisible' javaBean='false'/> + + <script><![CDATA[ +import org.codelutin.topia.persistence.TopiaEntity; + +protected JComponent cOrigine = null; +protected TopiaEntity bean = null; +protected java.util.List<JComponent> discretComponent = new ArrayList<JComponent>(); + +public void init(JComponent c, TopiaEntity bean, Boolean b){ + this.bean = bean; + this.cOrigine = c; + setContinuePossible(b); +} +protected JComponent getNewComponent(){ + return EditorHelper.getEditor(cOrigine, bean); +} +protected void addTabs(String sNbTab){ + int nbTab = Integer.parseInt(sNbTab); + discretComponent.clear(); + tabPane.removeAll(); + for (int i=0;i<nbTab;i++){ + JComponent c = getNewComponent(); + discretComponent.add(c); + tabPane.add(c, "Factor " + (i+1)); + } + setTabVisible(true); + this.pack(); +} + ]]> + </script> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell columns='1' fill='horizontal' weightx='0.5'> + <JLabel text='isisfish.factor.name'/> + </cell> + <cell columns='3' fill='horizontal' weightx='0.5'> + <JTextField id='factorName'/> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1'> + <JRadioButton id='continueRadion' text='isisfish.factor.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='false' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.25'> + <JLabel text='isisfish.factor.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JTextField id='continueMin' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JLabel text='isisfish.factor.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JTextField id='continueMax' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1'> + <JRadioButton id='discret' text='isisfish.factor.discret' selected='true' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadion.isSelected())'/> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.25'> + <JLabel text='isisfish.factor.selectDiscretNumber' enabled='{!isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.25'> + <JTextField id='discretNumber' enabled='{!isContinueSelected()}'/> + </cell> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JButton text='isisfish.factor.validDiscretNumber' enabled='{!isContinueSelected()}' onActionPerformed='addTabs(discretNumber.getText())'/> + </cell> + </row> + <row> + <cell columns='4' fill='both' weightx='1' weighty='1'> + <JTabbedPane id='tabPane' visible='{isTabVisible() && !isContinueSelected()}' enabled='{!isContinueSelected()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='this.dispose()'/> + </cell> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JButton id='save' text='isisfish.common.save'/> + </cell> + </row> + </Table> +</JDialog> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -83,7 +83,7 @@ e.printStackTrace(); } // go back to previous node - returnToPreviousNode(getNavigationTree(), event); + // returnToPreviousNode(getNavigationTree(), event); } @@ -97,9 +97,11 @@ // apply refresh method (should a contract for all this ui with a method refresh...) try { currentUI = (InputContentUI) newUI; - if (currentUI != null) + if (currentUI != null){ + currentUI.setTabListener(new SensitivityTabbedPaneListener()); + context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentUI.setLayer(true); - context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); + } currentNode = node; } catch (Exception e) { log.debug(e.getMessage(), e); @@ -125,7 +127,7 @@ else{ verif.addCurrentEntity(null); } - verif.refreshAll(); +// verif.refreshAll(); verif.setCurrentNode(node); } Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -0,0 +1,58 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui.sensitivity; + +import fr.ifremer.isisfish.ui.input.InputContentUI; +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.JOptionPane; +import javax.swing.JTabbedPane; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +/** + * + * @author letellier + */ +public class SensitivityTabbedPaneListener implements ChangeListener{ + + protected int cacheSelectedIndex = -1; + + @Override + public void stateChanged(ChangeEvent e) { + try { + JTabbedPane pane = (JTabbedPane)e.getSource(); + pane.removeChangeListener(this); + int selectedIndex = pane.getSelectedIndex(); + if (cacheSelectedIndex != -1){ + pane.setSelectedIndex(cacheSelectedIndex); + } + InputContentUI ui = (InputContentUI) pane.getSelectedComponent(); + if (closeUI(ui)) { + pane.setSelectedIndex(selectedIndex); + } + ui = (InputContentUI) pane.getSelectedComponent(); + ui.setLayer(true); + ui.refresh(); + cacheSelectedIndex = pane.getSelectedIndex(); + pane.addChangeListener(this); + } catch (Exception ex) { + Logger.getLogger(SensitivityTabbedPaneListener.class.getName()).log(Level.SEVERE, null, ex); + } + } + + /* + * Ask you to save if modification are made + * @param ui selected + * @return true to change tab + */ + protected boolean closeUI(InputContentUI context) throws Exception { + boolean exit = true; + return exit; + } + +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-04 17:36:39 UTC (rev 1910) @@ -128,7 +128,6 @@ refresh(); if (isSensitivity()){ try { - System.out.println("isSelectivity"); getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel(); } catch (StorageException ex) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-03-04 17:36:39 UTC (rev 1910) @@ -28,7 +28,6 @@ static public boolean isSensitivity(String sens){ Properties data = loadProperties(); - System.out.println(sens + " " + data.getProperty(sens)); return data.getProperty(sens) != null; } Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-04 17:36:39 UTC (rev 1910) @@ -351,6 +351,14 @@ isisfish.export.directory=Export directory isisfish.export.saved=Export saved isisfish.export.title=Results export +isisfish.factor.continue=Continue factor +isisfish.factor.discret=Discret factor +isisfish.factor.firstValue=First value +isisfish.factor.lastValue=Last value +isisfish.factor.name=Factor name +isisfish.factor.selectDiscretNumber=Number of factors +isisfish.factor.title=Factor input +isisfish.factor.validDiscretNumber=Ok isisfish.filter=Filter isisfish.filter.apply=Apply filter isisfish.filter.cancel=Cancel Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-04 13:14:34 UTC (rev 1909) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-04 17:36:39 UTC (rev 1910) @@ -351,6 +351,14 @@ isisfish.export.directory=Dossier d'export isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s isisfish.export.title=Export des r\u00E9sultats +isisfish.factor.continue=Facteur continue +isisfish.factor.discret=Facteur discret +isisfish.factor.firstValue=Premi\u00E8re valeur +isisfish.factor.lastValue=Derin\u00E8re valeur +isisfish.factor.name=Nom du facteur +isisfish.factor.selectDiscretNumber=Nombre de facteurs +isisfish.factor.title=Saisie d'un facteur +isisfish.factor.validDiscretNumber=Valider isisfish.filter=Filtrer isisfish.filter.apply=Appliquer le filtre isisfish.filter.cancel=Annuler

1 0

r1909 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity
by chatellier＠users.labs.libre-entreprise.org 04 Mar '09

04 Mar '09

Author: chatellier Date: 2009-03-04 13:14:34 +0000 (Wed, 04 Mar 2009) New Revision: 1909 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java Log: Remove autogenerated comment Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2009-03-04 11:53:49 UTC (rev 1908) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2009-03-04 13:14:34 UTC (rev 1909) @@ -41,6 +41,5 @@ */ public SensitivityException(String message, Throwable cause) { super(message, cause); - // TODO Auto-generated constructor stub } }

1 0

r1908 - isis-fish/trunk/src/test/java/fr/ifremer
by chatellier＠users.labs.libre-entreprise.org 04 Mar '09

04 Mar '09

Author: chatellier Date: 2009-03-04 11:53:49 +0000 (Wed, 04 Mar 2009) New Revision: 1908 Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java Log: Do not copy .svn sub directories Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-04 11:18:49 UTC (rev 1907) +++ isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-04 11:53:49 UTC (rev 1908) @@ -1,7 +1,9 @@ package fr.ifremer; import java.io.File; +import java.io.FileFilter; +import org.apache.commons.io.FileUtils; import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.IsisFish; @@ -62,13 +64,17 @@ IsisFish.init(); IsisFish.initVCS(); - - FileUtil.copyRecursively(new File("src/test/resources/test-database/analyseplans"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/export"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/regions"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/rules"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/scripts"), dirDatabase); - FileUtil.copyRecursively(new File("src/test/resources/test-database/simulators"), dirDatabase); + + FileUtils.copyDirectory(new File("src/test/resources/test-database"), dirDatabase, new FileFilter() { + @Override + public boolean accept(File pathname) { + boolean result = true; + if(pathname.getAbsolutePath().indexOf(File.separator + ".svn") != -1) { + result = false; + } + return result; + } + }); } /**

1 0

r1907 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/util test/java/fr/ifremer test/java/fr/ifremer/isisfish/simulator test/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/util test/java/fr/ifremer/isisfish/vcs
by chatellier＠users.labs.libre-entreprise.org 04 Mar '09

04 Mar '09

Author: chatellier Date: 2009-03-04 11:18:49 +0000 (Wed, 04 Mar 2009) New Revision: 1907 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java Removed: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/MethodTest.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java Log: Add matrix serialization to string. Fix some tests. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 + * Copyright (C) 2006 - 2009 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -17,22 +17,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ -/* * - * ConverterUtil.java - * - * Created: 25 sept. 06 19:37:16 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - package fr.ifremer.isisfish.util; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.ConvertUtilsBean; +import org.codelutin.math.matrix.MatrixND; import org.codelutin.topia.TopiaContext; import org.codelutin.topia.persistence.TopiaEntity; @@ -41,26 +30,30 @@ import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; - /** + * ConverterUtil. + * + * Created: 25 sept. 06 19:37:16 + * * @author poussin + * @version $Revision$ * + * Last update: $Date$ + * by : $Author$ */ - public class ConverterUtil { - static public ConvertUtilsBean getConverter(TopiaContext context) { + public static ConvertUtilsBean getConverter(TopiaContext context) { BeanUtilsBean result = BeanUtilsBean.getInstance(); ConvertUtilsBean cub = result.getConvertUtils(); - - cub.register(new TopiaEntityConverter(context), TopiaEntity.class); - - // FIXME see if register done in IsisFish.init() method permit to remove next line + // mise en place de converter de string vers des objet ... + cub.register(new TopiaEntityConverter(context), TopiaEntity.class); cub.register(new DateConverter(), Date.class); cub.register(new MonthConverter(), Month.class); cub.register(new TimeUnitConverter(), TimeUnit.class); cub.register(new RangeOfValuesConverter(), RangeOfValues.class); + cub.register(new MatrixConverter(), MatrixND.class); // ... et inversement cub.register(new StringConverter(), String.class); @@ -68,5 +61,3 @@ } } - - Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -0,0 +1,77 @@ +/* *##% Copyright (C) 2009 + * Code Lutin, Cédric Pineau, Benjamin Poussin + * + * 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.ifremer.isisfish.util; + +import org.apache.commons.beanutils.ConversionException; +import org.apache.commons.beanutils.Converter; +import org.apache.commons.lang.StringEscapeUtils; +import org.codelutin.math.matrix.MatrixND; +import org.codelutin.math.matrix.MatrixStringEncoder; +import org.codelutin.topia.persistence.TopiaEntity; + +/** + * Classe utilisées pour convertir des matrices en string et vice-versa. + * + * @author chatellier + * @version $Revision: 1526 $ + * + * Last update: $Date: 2008-10-07 18:46:13 +0200 (mar 07 oct 2008) $ + * by : $Author: tchemit $ + */ +public class MatrixConverter extends MatrixStringEncoder implements Converter { + + protected Converter defaultStringConverter = new org.apache.commons.beanutils.converters.StringConverter(); + + /* + * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) + */ + public Object convert(Class type, Object value) { + Object result; + if (value instanceof MatrixND) { + result = value; + } else if (value instanceof String) { + String sValue = (String)value; + sValue = StringEscapeUtils.unescapeJava(sValue); + result = getMatrixFromString(sValue); + } else if (value == null) { + result = null; + } else { + throw new ConversionException("Can't convert '" + value + "' to " + type.getName()); + } + return result; + } + + /* + * @see org.codelutin.math.matrix.MatrixStringEncoder#getQualifiedName(java.lang.Object) + */ + @Override + public String getQualifiedName(Object o) { + + String qualifiedName; + + if(o instanceof TopiaEntity) { + qualifiedName = TopiaEntity.class.getName(); + } + else { + qualifiedName = o.getClass().getName(); + } + return qualifiedName; + } + +} Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,5 +1,5 @@ -/* - * *##% Copyright (C) 2006 Code Lutin, Cédric Pineau, Benjamin Poussin +/* *##% Copyright (C) 2006 - 2009 + * Code Lutin, Cédric Pineau, Benjamin Poussin * * 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 @@ -16,21 +16,11 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. ##% */ -/******************************************************************************* - * StringConverter.java - * - * Created: 12 janv. 2006 20:38:26 - * - * @author poussin - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.util; import org.apache.commons.beanutils.Converter; +import org.apache.commons.lang.StringEscapeUtils; +import org.codelutin.math.matrix.MatrixND; import org.codelutin.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.types.Date; @@ -38,22 +28,24 @@ import fr.ifremer.isisfish.types.TimeUnit; /** - * Classe utilise pour convertir en chaine un objet Date, Month ou TopiaEntity - * Utilisé pour la conversion et le stockage en propriete des parametres + * Classe utilisée pour convertir en chaine un objet Date, Month ou TopiaEntity. + * Utilisé pour la conversion et le stockage en propriete des parametres. + * + * Created: 12 janv. 2006 20:38:26 + * * @author poussin * + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ public class StringConverter implements Converter { - private Converter defaultStringConverter = - new org.apache.commons.beanutils.converters.StringConverter(); + protected Converter defaultStringConverter = new org.apache.commons.beanutils.converters.StringConverter(); - /* - * (non-Javadoc) - * - * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, - * java.lang.Object) + * @see org.apache.commons.beanutils.Converter#convert(java.lang.Class, java.lang.Object) */ public Object convert(Class type, Object o) { Object result = null; @@ -66,6 +58,10 @@ result = String.valueOf(((Month) o).getMonthNumber()); } else if (o instanceof TimeUnit) { result = String.valueOf(((TimeUnit) o).getTime()); + } else if (o instanceof MatrixND) { + MatrixConverter converter = new MatrixConverter(); + result = converter.getMatrixAsString((MatrixND)o); + result = StringEscapeUtils.escapeJava((String)result); } else { // dans tous les autres cas, on appelle le converter par defaut result = defaultStringConverter.convert(type, o); Modified: isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/TestUtils.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -44,6 +44,9 @@ } /** + * Toujours appeler cette method pour les test d'isis. + * (sinon,il ira ecrire dans le isis-database-3 officiel). + * * Create a temp dir and init isis with that temp dir as database. * * @throws Exception Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -73,7 +73,6 @@ * * FIXME fix this test (empty schema error) */ - at Ignore public class SimulationPreScriptTest { private static final Log log = LogFactory.getLog(SimulationPreScriptTest.class); @@ -84,12 +83,15 @@ @BeforeClass public static void init() throws Exception { - TestUtils.init(); + //TestUtils.init(); freemarkerConfiguration = TestUtils.getFreemarkerConfiguration(); } @Before - public void setUp() { + public void setUp() throws Exception { + // not do it in @BeforeClass + // test wil fail ! + TestUtils.init(); System.setProperty("hibernate.hbm2ddl.auto", "create"); } Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -25,10 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.codelutin.math.matrix.MatrixFactory; import org.codelutin.math.matrix.MatrixND; -import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import fr.ifremer.TestUtils; @@ -60,21 +57,13 @@ private static final Log log = LogFactory.getLog(SimulationServiceTest.class); - @BeforeClass - public static void init() throws Exception { + @Before + public void setUp() throws Exception { + // not do it in @BeforeClass + // test wil fail ! TestUtils.init(); } - @Before - public void setUp() { - - } - - @After - public void tearDown() { - - } - /** * Build a test {@link DesignPlan}. * @@ -84,7 +73,7 @@ DesignPlan designPlan = new DesignPlan(); // factor 1 - Factor<Double> factor1 = new Factor<Double>("test double 1"); + Factor<Double> factor1 = new Factor<Double>("factor 1 (double)"); ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>(); domain1.setMinBound(0.0); domain1.setMaxBound(50.0); @@ -92,7 +81,7 @@ factor1.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521013#0.1715620681984218#maxLength"); // factor 2 - Factor<Double> factor2 = new Factor<Double>("test double 2"); + Factor<Double> factor2 = new Factor<Double>("factor 2 (double)"); DiscreteDomain<Double> domain2 = new DiscreteDomain<Double>(); domain2.getValues().put(0.0, 12.3); domain2.getValues().put(1.0, 70.9); @@ -103,7 +92,7 @@ factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength"); // factor 3 - Factor<Double> factor3 = new Factor<Double>("testint"); + Factor<Double> factor3 = new Factor<Double>("factor 3 (double)"); ContinuousDomain<Double> domain3 = new ContinuousDomain<Double>(); domain3.setMinBound(12.0); domain3.setMaxBound(99.0); @@ -135,14 +124,6 @@ matrix1.setValue(new int[] { 2, 0 }, 12); matrix1.setValue(new int[] { 2, 1 }, -1); - // factor 1 - Factor<Double> factor1 = new Factor<Double>("test double 1"); - ContinuousDomain<Double> domain1 = new ContinuousDomain<Double>(); - domain1.setMinBound(0.0); - domain1.setMaxBound(50.0); - factor1.setDomain(domain1); - factor1.setPath("fr.ifremer.isisfish.entities.Population#1156462366818#0.5536481119187864#maxLength"); - // matrix 2 MatrixND matrix2 = MatrixFactory.getInstance().create("test1", new int[] { 3, 2 }, new String[] { "col1", "col2" }); @@ -153,19 +134,15 @@ matrix2.setValue(new int[] { 2, 0 }, 12); matrix2.setValue(new int[] { 2, 1 }, -1); - // factor 2 - Factor<Double> factor2 = new Factor<Double>("test double 2"); - DiscreteDomain<Double> domain2 = new DiscreteDomain<Double>(); - domain2.getValues().put(0.0, 12.3); - domain2.getValues().put(1.0, 70.9); - domain2.getValues().put(2.0, 21.0); - domain2.getValues().put(3.0, -12.1); - domain2.getValues().put(4.0, -8.45); - factor2.setDomain(domain2); - factor2.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521064#0.022976136053553198#minLength"); + // factor 1 + Factor<MatrixND> factor1 = new Factor<MatrixND>("factor 1 (matrixND)"); + DiscreteDomain<MatrixND> domain1 = new DiscreteDomain<MatrixND>(); + domain1.getValues().put(0.0, matrix1); + domain1.getValues().put(1.0, matrix2); + factor1.setDomain(domain1); + factor1.setPath("fr.ifremer.isisfish.entities.StrategyMonthInfo#1156808754768#0.7282750856395208#proportionMetier"); designPlan.getFactors().add(factor1); - designPlan.getFactors().add(factor2); return designPlan; } @@ -173,7 +150,7 @@ /** * Lance une simulation avec des facteurs de sensibilité. */ - @Ignore + @Test public void testRunSensivitySimulation() { SimulationParameter params = new SimulationParameter(); @@ -222,10 +199,10 @@ /** * Lance une simulation avec des facteurs de sensibilité. * - * This test call R. + * This test use factors with matrix. */ @Test - public void testRunSensivitySimulationMorris() { + public void testRunSensivitySimulationWithMatrix() { SimulationParameter params = new SimulationParameter(); // set params region @@ -251,10 +228,9 @@ SimulatorLauncher launcher = new InProcessSimulatorLauncher(); service.addSimulationLauncher(launcher); - //SensitivityCalculator sensitivityCalculator = new SensitivityCalculatorRMorris(); SensitivityCalculator sensitivityCalculator = new SensitivityCalculatorRandomMock(); - DesignPlan designPlan = getTestDesignPlan(); + DesignPlan designPlan = getTestMatrixDesignPlan(); service.submit("sensitivity test number 1", params, launcher, 0, sensitivityCalculator, designPlan); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2008 Code Lutin + * Copyright (C) 2008 - 2009 Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -54,16 +54,20 @@ final String SIMULATIONID = "testid"; final String SIMULATIONZIP = "test.zip"; final String ISISHOME = IsisFish.config.getSimulatorSshIsisHome(); - + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); - String content = launcher.getSimulationScriptLaunchContent(SSHSimulatorLauncher.SQUB_SCRIPT_TEMPLATE, SIMULATIONID, SIMULATIONZIP); + String content = launcher.getSimulationScriptLaunchContent( + SSHSimulatorLauncher.SQUB_SCRIPT_TEMPLATE, SIMULATIONID, + SIMULATIONZIP); // simulation parameters - Assert.assertTrue("String \"" + SIMULATIONID + "\" not found in template", - content.indexOf(SIMULATIONID) > 0); - Assert.assertTrue("String \"" + SIMULATIONZIP + "\" not found in template", + Assert.assertTrue("String \"" + SIMULATIONID + + "\" not found in template", content + .indexOf(SIMULATIONID) > 0); + Assert.assertTrue("String \"" + SIMULATIONZIP + + "\" not found in template", content.indexOf(SIMULATIONZIP) > 0); - + // isis location Assert.assertTrue("String \"" + ISISHOME + "\" not found in template", content.indexOf(ISISHOME) > 0); Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,5 +1,5 @@ /* - * *##% Copyright (C) 2006 Code Lutin, Cédric Pineau, Benjamin Poussin + * *##% Copyright (C) 2006 - 2009 Code Lutin, Cédric Pineau, Benjamin Poussin * * 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 @@ -16,18 +16,6 @@ * Place - Suite 330, Boston, MA 02111-1307, USA. ##% */ -/******************************************************************************* - * ClassUtilTest.java - * - * Created: 12 janv. 2006 16:20:33 - * - * @author poussin - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.util; import junit.framework.TestCase; @@ -41,10 +29,17 @@ import java.util.List; /** + * ClassUtilTest. + * + * Created: 12 janv. 2006 16:20:33 + * * @author poussin * + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ */ - public class CompileHelperTest extends TestCase { public void testCompile() throws Exception { @@ -52,12 +47,13 @@ String filename = FileUtil.basename(f, ".java"); String code = "public class " + filename + " {}"; FileUtil.writeString(f, code); - + List<File> classpath = new ArrayList<File>(); classpath.add(f.getParentFile()); - - CompileHelper.compile(classpath, Collections.singletonList(f), f.getParentFile(), null); + CompileHelper.compile(classpath, Collections.singletonList(f), f + .getParentFile(), null); + // essai de chargement de la classe URL[] cp = new URL[] { f.getParentFile().toURI().toURL() }; //URL[] cp = new URL[] { f.getParentFile().toURL() }; @@ -80,10 +76,11 @@ FileUtil.writeString(fB, codeB); File dest = new File(fB.getParentFile(), "testCompile"); - + List<File> classpath = new ArrayList<File>(); classpath.add(fB.getParentFile()); - CompileHelper.compile(classpath, Collections.singletonList(fB), dest, null); + CompileHelper.compile(classpath, Collections.singletonList(fB), dest, + null); { // essai de chargement de la classe Deleted: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/MethodTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/MethodTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/util/MethodTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -1,10 +0,0 @@ -package fr.ifremer.isisfish.util; - -/** - * to mark a test method (public void testXXX throws Exception()) in our TestCase - */ - at java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) - at java.lang.annotation.Target(value = {java.lang.annotation.ElementType.METHOD}) - -public @interface MethodTest { -} Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-03-03 17:19:33 UTC (rev 1906) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2009-03-04 11:18:49 UTC (rev 1907) @@ -91,7 +91,7 @@ */ @BeforeClass public static void init() throws Exception { - IsisFish.init(); + TestUtils.init(); template = new File(TMPDIR, "testsvn-template"); remoteRepo = new File(TMPDIR, "testsvn-repo");

1 0

r1906 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 03 Mar '09

03 Mar '09

Author: sletellier Date: 2009-03-03 17:19:33 +0000 (Tue, 03 Mar 2009) New Revision: 1906 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Ajout de la saisie des sensibilit?\195?\169s Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-03 17:19:33 UTC (rev 1906) @@ -31,12 +31,17 @@ */ --> <Table> + +  + <Boolean id='sensitivity' javaBean='false'/> + <script><![CDATA[ import static org.codelutin.i18n.I18n._; import fr.ifremer.isisfish.ui.Common; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.ui.WelcomeUI; import fr.ifremer.isisfish.ui.WelcomePanelUI; + import fr.ifremer.isisfish.ui.WelcomeTabUI; import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; import fr.ifremer.isisfish.entities.Strategy; @@ -58,6 +63,9 @@ import org.dom4j.Element; import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; + import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; + import fr.ifremer.isisfish.entities.FisheryRegionImpl; + import fr.ifremer.isisfish.datastore.StorageException; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; SimulationServiceListener simulationListener; @@ -81,6 +89,7 @@ setContextValue(action); } public void refresh(){ + setSensitivity(getParentContainer(SensitivityUI.class) != null); SimulationService.getService().removeSimulationServiceListener(simulationListener); SimulationService.getService().addSimulationServiceListener(simulationListener); if (getContextValue(SimulAction.class).getSimulationStorage() != null){ @@ -117,6 +126,15 @@ public void run() { getContextValue(SimulAction.class).regionChange(selected); refresh(); + if (isSensitivity()){ + try { + System.out.println("isSelectivity"); + getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); + getParentContainer(SensitivityUI.class).getSensitivityTabUI().setTreeModel(); + } catch (StorageException ex) { + log.debug(ex.getMessage(), ex); + }; + } getParentContainer(WelcomePanelUI.class).setInfoText(_("isisfish.message.region.loaded")); } }); @@ -156,8 +174,7 @@ } protected void simul(){ getContextValue(SimulAction.class).launchSimulation(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); - SimulUI simul = getParentContainer(SimulUI.class); - simul.selTab(6); + getParentContainer(WelcomeTabUI.class).selTab(5); } protected void enablePreSimul(){ if (fieldUseSimulPreScripts.isSelected()){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-03-03 17:19:33 UTC (rev 1906) @@ -34,6 +34,11 @@ <script><![CDATA[ import org.dom4j.DocumentHelper; import org.dom4j.Element; + import jaxx.runtime.JAXXInitialContext; + import fr.ifremer.isisfish.ui.input.InputAction; + import fr.ifremer.isisfish.ui.input.InputSaveVerifier; + import fr.ifremer.isisfish.datastore.StorageException; + import fr.ifremer.isisfish.entities.FisheryRegionImpl; public SimulUI(SimulAction action){ setContextValue(action); @@ -56,7 +61,6 @@ exportUI.refresh(); resultChoiceUI.refresh(); advencedParamsUI.refresh(); - queueUI.refresh(); } protected void importSimulation(){ JFileChooser fc = new JFileChooser(); @@ -77,9 +81,6 @@ File file = fc.getSelectedFile(); //This is where a real application would open the file. getContextValue(SimulAction.class).saveSimulation(file); -// Element result = DocumentHelper.createElement("simul"); -// result.add(paramsUI.save()); -// System.out.println(result.asXML()); } } ]]> @@ -109,8 +110,5 @@ <tab id="advancedParamsUITab" title='isisfish.advancedParameters.title'> <AdvancedParamsUI id="advencedParamsUI" constructorParams='getContextValue(SimulAction.class)'/> </tab> - <tab id="queueUITab" title='isisfish.queue.title'> - <QueueUI id="queueUI" constructorParams='getContextValue(SimulAction.class)'/> - </tab> </JTabbedPane> </JPanel> \ No newline at end of file

1 0

r1905 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/sensitivity src/main/java/fr/ifremer/isisfish/ui/util src/main/resources src/main/resources/i18n src/main/resources/images
by sletellier＠users.labs.libre-entreprise.org 03 Mar '09

03 Mar '09

Author: sletellier Date: 2009-03-03 17:19:21 +0000 (Tue, 03 Mar 2009) New Revision: 1905 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java isis-fish/trunk/src/main/resources/images/Queue.gif isis-fish/trunk/src/main/resources/images/sensitivities.gif isis-fish/trunk/src/main/resources/sensitivity.properties Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Ajout de la saisie des sensibilit?\195?\169s Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/pom.xml 2009-03-03 17:19:21 UTC (rev 1905) @@ -345,7 +345,7 @@ <labs.project>isis-fish</labs.project>  - <jaxx.version>1.2</jaxx.version> + <jaxx.version>1.3-SNAPSHOT</jaxx.version> <topia.version>2.1.3</topia.version> <topia.service.version>1.0.2</topia.service.version> <lutinmatrix.version>1.3-SNAPSHOT</lutinmatrix.version> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -33,18 +33,25 @@ <JPanel id='welcomePanelUI' layout='{new BorderLayout()}'> <script><![CDATA[ import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.result.ResultAction; import jaxx.runtime.JAXXInitialContext; + import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; simulUI.getContextValue(SimulAction.class).init(); + + public void selTab(int i){ + simulTabs.setSelectedIndex(i); + } ]]> </script> <JTabbedPane id="simulTabs" tabPlacement='{JTabbedPane.LEFT}' constraints="BorderLayout.CENTER"> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/simulation.gif"))}'> <fr.ifremer.isisfish.ui.simulator.SimulUI id='simulUI' constructorParams='new SimulAction()'/> </tab> + <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/sensitivities.gif"))}'> + <fr.ifremer.isisfish.ui.sensitivity.SensitivityUI id="sensitivityUI" constructorParams='new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(this)'/> + </tab> <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'> <fr.ifremer.isisfish.ui.result.ResultView/> </tab> @@ -54,5 +61,8 @@ <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/bookPage.gif"))}'> <fr.ifremer.isisfish.ui.script.ScriptUI/> </tab> + <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/Queue.gif"))}'> + <fr.ifremer.isisfish.ui.simulator.QueueUI/> + </tab> </JTabbedPane> </JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -36,6 +36,7 @@ import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.input.InputUI; import fr.ifremer.isisfish.ui.input.InputAction; + import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; import fr.ifremer.isisfish.ui.result.ResultAction; import fr.ifremer.isisfish.ui.result.ResultView; import fr.ifremer.isisfish.ui.script.ScriptUI; @@ -161,6 +162,7 @@ <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='openFrame(new ResultView(), _("isisfish.result.title"))'/> <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title"))'/> <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> + <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='openFrame(new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.sensitivity.title"))'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> <JSeparator/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -132,7 +132,8 @@ <JLabel text="isisfish.cell.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed' + _bean='{getBean()}' _method='"Name"' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> </cell> </row> <row> @@ -140,7 +141,7 @@ <JLabel text="isisfish.cell.latitude" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}'/> + <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Latitude"'/> </cell> </row> <row> @@ -148,7 +149,7 @@ <JLabel text="isisfish.cell.longitude" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}'/> + <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Longitude"'/> </cell> </row> <row> @@ -156,7 +157,7 @@ <JLabel text="isisfish.cell.land" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}'/> + <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Land"'/> </cell> </row> <row> @@ -167,7 +168,7 @@ <row> <cell columns='2' fill='both' weighty='1.0' weightx='1.0'> <JScrollPane> - <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{CellImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -186,4 +187,4 @@ </JPanel> </JSplitPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -142,7 +142,7 @@ <JLabel text="isisfish.effortDescription.fishingOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onKeyReleased='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onKeyReleased='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/> </cell> </row> <row> @@ -150,7 +150,7 @@ <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/> </cell> </row> <row> @@ -158,7 +158,7 @@ <JLabel text="isisfish.effortDescription.gearsNumberPerOperation" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onKeyReleased='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onKeyReleased='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/> </cell> </row> <row> @@ -166,7 +166,7 @@ <JLabel text="isisfish.effortDescription.crewSize" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onKeyReleased='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onKeyReleased='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/> </cell> </row> <row> @@ -174,7 +174,7 @@ <JLabel text="isisfish.effortDescription.unitCostOfFishing" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onKeyReleased='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onKeyReleased='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/> </cell> </row> <row> @@ -182,7 +182,7 @@ <JLabel text="isisfish.effortDescription.fixedCrewSalary" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onKeyReleased='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onKeyReleased='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/> </cell> </row> <row> @@ -190,7 +190,7 @@ <JLabel text="isisfish.effortDescription.crewFoodCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onKeyReleased='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onKeyReleased='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/> </cell> </row> <row> @@ -198,7 +198,7 @@ <JLabel text="isisfish.effortDescription.crewShareRate" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onKeyReleased='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onKeyReleased='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/> </cell> </row> <row> @@ -206,7 +206,7 @@ <JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onKeyReleased='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onKeyReleased='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/> </cell> </row> <row> @@ -214,7 +214,7 @@ <JLabel text="isisfish.effortDescription.landingCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onKeyReleased='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onKeyReleased='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/> </cell> </row> <row> @@ -222,7 +222,7 @@ <JLabel text="isisfish.effortDescription.otherRunningCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onKeyReleased='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onKeyReleased='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/> </cell> </row> <row> @@ -246,4 +246,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -133,7 +133,10 @@ </row> <row> <cell columns='3' fill='horizontal' weightx='1.0'> - <JTextField id="fieldRegion" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' onKeyReleased='getBean().setName(fieldRegion.getText())'/> + <JTextField id="fieldRegion" decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"Name"' + text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' + onKeyReleased='getBean().setName(fieldRegion.getText())'/> </cell> </row> <row> @@ -146,7 +149,8 @@ <JLabel text="isisfish.fisheryRegion.latitude.min"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> + <JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"MinLatitude"' onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/> </cell> </row> <row> @@ -154,7 +158,8 @@ <JLabel text="isisfish.fisheryRegion.latitude.max"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> + <JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"MaxLatitude"' onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/> </cell> </row> <row> @@ -162,7 +167,8 @@ <JLabel text="isisfish.fisheryRegion.longitude.min"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> + <JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"MinLongitude"' onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/> </cell> </row> <row> @@ -170,7 +176,8 @@ <JLabel text="isisfish.fisheryRegion.longitude.max"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> + <JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"MaxLongitude"' onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/> </cell> </row> <row> @@ -183,7 +190,8 @@ <JLabel text="isisfish.fisheryRegion.latitude"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> + <JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"CellLengthLatitude"' onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/> </cell> </row> <row> @@ -191,7 +199,8 @@ <JLabel text="isisfish.fisheryRegion.longitude"/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> + <JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"CellLengthLongitude"' onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/> </cell> </row> <row> @@ -223,7 +232,8 @@ <row> <cell columns='3' fill='both' weightx='1.0' weighty='0.4'> <JScrollPane> - <JTextArea id="fieldComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldComment.getText())'/> + <JTextArea id="fieldComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' decorator='boxed' + _bean='{FisheryRegionImpl.class}' _method='"Comment"' onKeyReleased='getBean().setComment(fieldComment.getText())'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -99,7 +99,7 @@ <JLabel text="isisfish.gear.name" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldGearName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldGearName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -107,7 +107,7 @@ <JLabel text="isisfish.gear.effortUnit" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}'/> + <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"EffortUnit"'/> </cell> </row> <row> @@ -115,7 +115,7 @@ <JLabel text="isisfish.gear.standardisationFactor" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"StandardisationFactor"'/> </cell> </row> <row> @@ -123,7 +123,7 @@ <JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/> </cell> <cell columns="2" fill='horizontal' weightx='1.0'> - <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"ParameterName"'/> </cell> </row> <row> @@ -134,7 +134,7 @@ <JComboBox id="fieldGearParamType" onActionPerformed='paramChanged()' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}'/> + <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/> </cell> </row> <row> @@ -143,7 +143,7 @@ </cell> <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -173,4 +173,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -52,4 +52,4 @@ <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI id="selectivityUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-03-03 17:19:21 UTC (rev 1905) @@ -321,7 +321,7 @@ * * @param name name of region */ - public FisheryRegion loadRegion(InputUI ui, String name) { + public FisheryRegion loadRegion(jaxx.runtime.JAXXObject ui, String name) { if (log.isTraceEnabled()) { log.trace("loadRegion called"); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -25,6 +25,9 @@ import org.codelutin.topia.persistence.TopiaEntity; import javax.swing.JComponent; import jaxx.runtime.SwingUtil; +import java.lang.reflect.Method; +import org.apache.commons.beanutils.MethodUtils; +import fr.ifremer.isisfish.ui.util.UtilsUI; public void refresh(){} public InputAction getAction() { @@ -45,18 +48,42 @@ public void setBean(TopiaEntity t){}; public void setLayer(boolean active) { - System.out.println(active); - for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { - //TODO si dans le component, on a une certaine propriete, - //TODO on utilise le layer avec icone, sinon un layer sans icone (blocage totale) - jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; - SwingUtil.getLayer(boxed).setUI(ui); + if (this.get$objectMap() != null){ + for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { + // Verifie si dans l'entré existe dans le fichier sensitivity.properties + Class classBean = (Class)boxed.getClientProperty("bean"); + String method = (String)boxed.getClientProperty("method"); + boolean isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); + + jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; + ui.setUseIcon(isSensitivity); + SwingUtil.getLayer(boxed).setUI(ui); + } } } + protected void accept(ActionEvent e) { JComponent source = (JComponent) e.getSource(); - System.out.println(source); + Class classBean = (Class)source.getClientProperty("bean"); + String method = (String)source.getClientProperty("method"); + + System.out.println("bean : " + classBean); + System.out.println("method : " + method); + System.out.println("in Properies : " + UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method)); + + Object result = null; + try { + if (classBean != null && method != null){ + TopiaEntity bean = getVerifier().getEntity(classBean); + + Method m = bean.getClass().getMethod("get" + method, null); + result = m.invoke(bean, (Object[])null); + } + } catch (Exception ex) { + System.out.println(ex); + } + System.out.println("result : " + result); } ]]> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -240,4 +240,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-03-03 17:19:21 UTC (rev 1905) @@ -275,7 +275,7 @@ } } } - protected void refreshAll(){ + public void refreshAll(){ for (InputContentUI panel : currentPanels){ panel.refresh(); panel.setActif(editable); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -260,4 +260,4 @@ <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> </JPanel> </JSplitPane> -</JPanel> \ No newline at end of file +</JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -288,4 +288,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -225,7 +225,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}'/> + <JTextArea id="fieldMetierSeasonZoneComment" text='{getMetierSeasonInfo() == null ? "" : jaxx.runtime.SwingUtil.getStringValue(getMetierSeasonInfo().getSeasonZoneComment())}' onKeyReleased='getMetierSeasonInfo().setSeasonZoneComment(fieldMetierSeasonZoneComment.getText())' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierSeasonInfo.class}' _method='"SeasonZoneComment"'/> </JScrollPane> </cell> </row> @@ -255,4 +255,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -75,7 +75,7 @@ <JLabel text="isisfish.metier.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -91,7 +91,7 @@ <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}'/> + <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"GearParameterValue"'/> </cell> </row> <row> @@ -100,7 +100,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -130,4 +130,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -55,4 +55,4 @@ <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/></tab> </JTabbedPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -1,3 +1,3 @@ <JPanel layout='{new BorderLayout()}'> <JLabel id='none' horizontalAlignment="0" text="isisfish.input.selectRegion" constraints='BorderLayout.CENTER'/> -</JPanel> \ No newline at end of file +</JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -153,7 +153,7 @@ <JLabel text="isisfish.populationBasics.name" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -161,7 +161,7 @@ <JLabel text="isisfish.populationBasics.geographicID" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}'/> + <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"GeographicId"'/> </cell> </row> <row> @@ -183,7 +183,7 @@ <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}'/> + <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"PlusGroup"'/> </cell> </row> <row> @@ -207,7 +207,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.2'> <JScrollPane> - <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -246,4 +246,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -92,7 +92,7 @@ </row> <row> <cell columns='2' fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/> </cell> </row> <row> @@ -103,7 +103,7 @@ <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationCapturabilityComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCapturabilityComment())}' onKeyReleased='getBean().setCapturabilityComment(fieldPopulationCapturabilityComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"CapturabilityComment"'/> </JScrollPane> </cell> </row> @@ -116,4 +116,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -95,4 +95,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -117,7 +117,7 @@ <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupMeanWeight" text='{getPopulationGroup().getMeanWeight()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MeanWeight"'/> </cell> </row> <row> @@ -125,7 +125,7 @@ <JLabel text="isisfish.populationGroup.price" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' editable='{false}' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupPrice" text='{getPopulationGroup().getPrice()}' editable='{false}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Price"'/> </cell> </row> <row> @@ -133,7 +133,7 @@ <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/> </cell> </row> <row> @@ -141,7 +141,7 @@ <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> </cell> </row> <row> @@ -149,7 +149,7 @@ <JLabel text="isisfish.populationGroup.age" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/> </cell> </row> <row> @@ -157,10 +157,10 @@ <JLabel text="isisfish.populationGroup.length" enabled='{isPopGroupNotNull()}'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/> </cell> <cell fill='both' weightx='0.5'> - <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isPopGroupNotNull()}'/> + <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/> </cell> </row> <row> @@ -169,7 +169,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}'/> + <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -188,4 +188,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -224,7 +224,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/> </cell> </row> <row> @@ -233,4 +233,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -91,4 +91,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -194,7 +194,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/> </cell> </row> <row> @@ -203,4 +203,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -211,7 +211,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/> </cell> </row> <row> @@ -220,4 +220,4 @@ </cell> </row> </Table> - </fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file + </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -129,7 +129,7 @@ </row> <row> <cell columns='2' anchor='west'> - <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}'/> + <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"UseEquationMigration"'/> </cell> </row> <row> @@ -150,7 +150,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MigrationComment"'/> </JScrollPane> </cell> </row> @@ -169,4 +169,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -103,7 +103,7 @@ <JLabel text="Month Gap BetweenRepro Recruitment" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/> </cell> </row> <row> @@ -111,7 +111,7 @@ <JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/> </cell> <cell fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/> </cell> </row> <row> @@ -128,7 +128,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.5'> <JScrollPane> - <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentComment"'/> </JScrollPane> </cell> </row> @@ -150,4 +150,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -234,7 +234,7 @@ <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='both' weightx='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> </cell> </row> <row> @@ -243,7 +243,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}'/> + <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"SeasonsComment"'/> </JScrollPane> </cell> </row> @@ -273,4 +273,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -82,4 +82,4 @@ </tab> </JTabbedPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -219,4 +219,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -144,7 +144,7 @@ </row> <row> <cell columns='2' fill='horizontal' weightx='1.0' > - <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldPortName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPortName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -156,7 +156,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}'/> + <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Cell"'/> </JScrollPane> </cell> </row> @@ -168,7 +168,7 @@ <row> <cell columns='2' fill='both' weighty='0.3' weightx='1.0' > <JScrollPane> - <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldPortComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPortComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -191,10 +191,10 @@ </Table> <JPanel id='map' layout='{new BorderLayout()}'> <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH'/> - <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1"/> + <fr.ifremer.isisfish.map.IsisMapBean id='portMap' selectedCells='{getBean().getCell()}' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' constraints='BorderLayout.CENTER' selectionMode="1" decorator='boxed' _bean='{PortImpl.class}' _method='"Cell"'/> </JPanel> </JSplitPane> </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -98,7 +98,6 @@ public void refresh(){ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); - InputAction action = getAction(); setBean(null); Gear gear = (Gear)getVerifier().getEntity(Gear.class); setBean((GearImpl) gear); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -98,7 +98,7 @@ <JLabel text="isisfish.setOfVessels.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSetOfVesselsName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -122,7 +122,7 @@ <JLabel text="isisfish.setOfVessels.numberOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/> </cell> </row> <row> @@ -130,7 +130,7 @@ <JLabel text="isisfish.setOfVessels.fixedCosts" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}' onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}' onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/> </cell> </row> <row> @@ -144,7 +144,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -174,4 +174,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -84,7 +84,7 @@ <JLabel text="isisfish.species.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -92,7 +92,7 @@ <JLabel text="isisfish.species.scientificName" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"ScientificName"'/> </cell> </row> <row> @@ -100,7 +100,7 @@ <JLabel text="isisfish.species.rubbinCode" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeRubbin"'/> </cell> </row> <row> @@ -108,7 +108,7 @@ <JLabel text="isisfish.species.cee" enabled='{isActif()}'/> </cell> <cell fill='horizontal' columns='2' weightx='1.0'> - <JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeCEE"'/> </cell> </row> <row> @@ -116,10 +116,10 @@ <JLabel text="isisfish.species.structured" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected())' enabled='{isActif()}'/> + <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{!getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}'/> + <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{!getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/> </cell> </row> <row> @@ -128,7 +128,7 @@ </cell> <cell fill='both' columns='2' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -158,4 +158,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -116,4 +116,4 @@ </row> </Table> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -136,7 +136,7 @@ <JLabel text="isisfish.strategyMonthInfo.numberOfTrips" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5' anchor='west'> - <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}'/> + <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> </cell> </row> <row> @@ -144,13 +144,13 @@ <JLabel text="isisfish.strategyMonthInfo.minInactivityDays" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -98,7 +98,7 @@ <JLabel text="isisfish.strategy.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldStrategyName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldStrategyName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -114,7 +114,7 @@ <JLabel text="isisfish.strategy.proportionSetOfVessels" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}' onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}' onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/> </cell> </row> <row> @@ -122,7 +122,7 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}'/> + <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"InactivityEquationUsed"'/> </cell> </row> <row> @@ -136,7 +136,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldStrategyComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldStrategyComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -166,4 +166,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -81,7 +81,7 @@ <JLabel text="isisfish.tripType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -89,7 +89,7 @@ <JLabel text="isisfish.tripType.duration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"TripDuration"'/> </cell> </row> <row> @@ -97,7 +97,7 @@ <JLabel text="isisfish.tripType.minTime" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}' onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' enabled='{isActif()}'/> + <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}' onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"MinTimeBetweenTrip"'/> </cell> </row> <row> @@ -106,7 +106,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -137,4 +137,4 @@ </row> </Table> </fr.ifremer.isisfish.ui.input.InputContentUI> - \ No newline at end of file + Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -102,7 +102,7 @@ <JLabel text="isisfish.vesselType.name" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())'/> + <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Name"'/> </cell> </row> <row> @@ -110,7 +110,7 @@ <JLabel text="isisfish.vesselType.length" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))'/> + <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/> </cell> </row> <row> @@ -118,7 +118,7 @@ <JLabel text="isisfish.vesselType.speed" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))'/> + <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/> </cell> </row> <row> @@ -126,7 +126,7 @@ <JLabel text="isisfish.vesselType.maxDuration" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))'/> + <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MaxTripDuration"'/> </cell> </row> <row> @@ -134,7 +134,7 @@ <JLabel text="isisfish.vesselType.activityRange" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))'/> + <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/> </cell> </row> <row> @@ -142,7 +142,7 @@ <JLabel text="isisfish.vesselType.miniCrew" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))'/> + <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/> </cell> </row> <row> @@ -150,7 +150,7 @@ <JLabel text="isisfish.vesselType.fuelCost" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' enabled='{isActif()}'/> + <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/> </cell> </row> <row> @@ -159,7 +159,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.7'> <JScrollPane> - <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' enabled='{isActif()}'/> + <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"TripType"'/> </JScrollPane> </cell> </row> @@ -169,7 +169,7 @@ </cell> <cell fill='both' weightx='1.0' weighty='0.3'> <JScrollPane> - <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}'/> + <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Comment"'/> </JScrollPane> </cell> </row> @@ -199,4 +199,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -579,4 +579,4 @@ </cell> </row> </Table> -</JPanel> \ No newline at end of file +</JPanel> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -148,7 +148,7 @@ <row> <cell columns='2' fill='both' weighty='0.7' weightx='1.0'> <JScrollPane> - <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' onMouseClicked='if ( isActif() ) { zoneCellsChange(); }'/> + <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}' onMouseClicked='if ( isActif() ) { zoneCellsChange(); }' decorator='boxed' _bean='{ZoneImpl.class}' _method='"Cell"'/> </JScrollPane> </cell> </row> @@ -199,4 +199,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,227 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui.sensitivity; + +import fr.ifremer.isisfish.entities.Cell; +import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.entities.Gear; +import fr.ifremer.isisfish.entities.Metier; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Port; +import fr.ifremer.isisfish.entities.SetOfVessels; +import fr.ifremer.isisfish.entities.Species; +import fr.ifremer.isisfish.entities.TripType; +import fr.ifremer.isisfish.entities.VesselType; +import fr.ifremer.isisfish.entities.Zone; +import fr.ifremer.isisfish.ui.input.*; +import jaxx.runtime.Decorator; +import jaxx.runtime.JAXXContextEntryDef; +import jaxx.runtime.swing.CardLayout2; +import jaxx.runtime.swing.JAXXTree; +import jaxx.runtime.swing.navigation.NavigationTreeModel; +import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; +import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder; +import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder.ChildBuilder; +import jaxx.runtime.swing.navigation.NavigationTreeSelectionAdapterWithCardLayout; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; +import org.codelutin.topia.persistence.TopiaEntity; + +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTree; +import javax.swing.event.TreeSelectionEvent; +import java.awt.Component; +import org.hibernate.transaction.JOTMTransactionManagerLookup; + +/** @author letellier */ +public class SensitivityNavigationTreeSelectionAdapter extends NavigationTreeSelectionAdapterWithCardLayout { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(SensitivityNavigationTreeSelectionAdapter.class); + + protected NavigationTreeNode currentNode = null; + protected InputContentUI currentUI = null; + protected TopiaEntity currentEntity = null; + + public SensitivityNavigationTreeSelectionAdapter(SensitivityTabUI context, boolean register) { + super(SensitivityTabUI.class, null, context, Strategy.PER_UI_TYPE); + + if (context.getNavigation() == null) { + throw new IllegalArgumentException("could not have a null 'navigation' in ui " + context); + } + + if (register) { + // register in tree this listener + context.getNavigation().addTreeSelectionListener(this); + } + } + + @Override + protected JPanel getContentContainer() { + return ((SensitivityTabUI) context).getInputPane(); + } + + @Override + protected CardLayout2 getContentLayout() { + return ((SensitivityTabUI) context).getCardlayout(); + } + + @Override + protected NavigationTreeModel getNavigationTreeModel() { + return (NavigationTreeModel) ((SensitivityTabUI) context).getNavigation().getModel(); + } + + @Override + protected void goBackToPreviousNode(TreeSelectionEvent event, Exception e) { + if (e != null) { +// ErrorDialogUI.showError(e); + e.printStackTrace(); + } + // go back to previous node + returnToPreviousNode(getNavigationTree(), event); + } + + + protected JAXXTree getNavigationTree() { + return ((SensitivityTabUI) context).getNavigation(); + } + + @Override + protected void openUI(Component newUI, NavigationTreeNode node) throws Exception { + super.openUI(newUI, node); + // apply refresh method (should a contract for all this ui with a method refresh...) + try { + currentUI = (InputContentUI) newUI; + if (currentUI != null) + currentUI.setLayer(true); + context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); + currentNode = node; + } catch (Exception e) { + log.debug(e.getMessage(), e); + } + } + + @Override + protected boolean closeUI(TreeSelectionEvent event, Component component) throws Exception { + boolean exit = true; + return exit; + } + + @Override + protected void addSelectedBeanInContext(NavigationTreeNode node, Object data) { + if (log.isDebugEnabled()) { + log.debug("find data for contextPath <" + node.getContextPath() + "> : " + (data == null ? null : data.getClass())); + } + InputSaveVerifier verif = context.getContextValue(InputSaveVerifier.class); + verif.removeAllEntity(); + if (TopiaEntity.class.isInstance(data)){ + verif.addCurrentEntity((TopiaEntity) data); + } + else{ + verif.addCurrentEntity(null); + } + verif.refreshAll(); + verif.setCurrentNode(node); + } + + public static NavigationTreeModel getTreeModel(String regionName, FisheryRegion fisheryRegion) { + + NavigationTreeModelBuilder builder = new NavigationTreeModelBuilder("/"); + + if (regionName == null) { + return null; + } + + ChildBuilder<TopiaEntity> childParentBuilder = new ChildBuilder<TopiaEntity>(builder) { + + Decorator<? extends TopiaEntity> decorator; + + public void init(Class<? extends TopiaEntity> klass) { + decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); + } + + public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { + return decorator; + } + + public String getJXPath(TopiaEntity child) { + return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; + } + + public String getNavigationPath(TopiaEntity child) { + return child.getTopiaId(); + } + }; + + ChildBuilder<TopiaEntity> childBuilder = new ChildBuilder<TopiaEntity>(builder) { + + Decorator<? extends TopiaEntity> decorator; + + public void init(Class<? extends TopiaEntity> klass) { + decorator = jaxx.runtime.PropertyDecorator.newDecorator(klass, "name"); + } + + public Decorator<? extends TopiaEntity> getDecorator(TopiaEntity child) { + return decorator; + } + + public String getJXPath(TopiaEntity child) { + return "..[@topiaId=\"" + child.getTopiaId() + "\"]"; + } + + public String getNavigationPath(TopiaEntity child) { + return child.getTopiaId(); + } + }; + + try { + + NavigationTreeNode root = builder.build(null, regionName, JAXXContextEntryDef.newDef(FisheryRegion.class), "$root", FisheryRegionUI.class, null); + + childBuilder.build(builder.build(root, "Cells", "../cell", "$cells", CellUI.class, null), + true, Cell.class, fisheryRegion.getCell(), CellUI.class, null); + + childBuilder.build(builder.build(root, "Zones", "../zone", "$zones", ZoneUI.class, null), + true, Zone.class, fisheryRegion.getZone(), ZoneUI.class, null); + + childBuilder.build(builder.build(root, "Ports", "../port", "$ports", PortUI.class, null), + true, Port.class, fisheryRegion.getPort(), PortUI.class, null); + + NavigationTreeNode species = builder.build(root, "Species", "../species", "$species", SpeciesUI.class, null); + + for (Species specie : fisheryRegion.getSpecies()) { + NavigationTreeNode speciesChild = builder.build(species, specie.toString(), "..[@topiaId=\"" + specie.getTopiaId() + "\"]", specie.getTopiaId(), SpeciesUI.class, null); + NavigationTreeNode populations = builder.build(speciesChild, "Populations", "../population", "$populations", PopulationUI.class, null); + childBuilder.build(populations, true, Population.class, specie.getPopulation(), PopulationUI.class, null); + } + + childBuilder.build(builder.build(root, "Gears", "../gear", "$gears", GearUI.class, null), + true, Gear.class, fisheryRegion.getGear(), GearUI.class, null); + + childBuilder.build(builder.build(root, "Metiers", "../metier", "$metiers", MetierUI.class, null), + true, Metier.class, fisheryRegion.getMetier(), MetierUI.class, null); + + childBuilder.build(builder.build(root, "TripTypes", "../tripType", "$tripTypes", TripTypeUI.class, null), + true, TripType.class, fisheryRegion.getTripType(), TripTypeUI.class, null); + + childBuilder.build(builder.build(root, "VesselTypes", "../vesselType", "$vesselTypes", VesselTypeUI.class, null), + true, VesselType.class, fisheryRegion.getVesselType(), VesselTypeUI.class, null); + + childBuilder.build(builder.build(root, "SetOfVessels", "../setOfVessels", "$setOfVessels", SetOfVesselsUI.class, null), + true, SetOfVessels.class, fisheryRegion.getSetOfVessels(), SetOfVesselsUI.class, null); + + childBuilder.build(builder.build(root, "Strategies", "../strategy", "$strategies", StrategyUI.class, null), + true, fr.ifremer.isisfish.entities.Strategy.class, fisheryRegion.getStrategy(), StrategyUI.class, null); + + } catch (Exception ex) { + log.error(ex.getMessage(), ex); + } + return builder.getModel(); + } + +} Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,130 @@ + +<JPanel id="sensibilityTabUI" layout='{new BorderLayout()}'> + + <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/> + + <jaxx.runtime.swing.CardLayout2 id='cardlayout'/> + + <java.awt.CardLayout id='cardlayoutPrincipal'/> + + <fr.ifremer.isisfish.entities.FisheryRegionImpl id='region' javaBean='null'/> + + <script><![CDATA[ + +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.entities.FisheryRegionImpl; +import fr.ifremer.isisfish.ui.Common; +import fr.ifremer.isisfish.ui.WelcomePanelUI; +import fr.ifremer.isisfish.ui.input.InputAction; +import fr.ifremer.isisfish.ui.input.InputNavigationTreeSelectionAdapter; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreePath; +import jaxx.runtime.swing.navigation.NavigationTreeCellRenderer; +import jaxx.runtime.swing.navigation.NavigationTreeModel; +import fr.ifremer.isisfish.ui.input.InputSaveVerifier; +import org.codelutin.topia.TopiaContext; +import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; +import jaxx.runtime.swing.navigation.NavigationUtil; + +protected InputAction getInputAction(){ + return getContextValue(InputAction.class); +} +protected InputSaveVerifier getVerifier(){ + return getContextValue(InputSaveVerifier.class); +} +protected RegionStorage getRegionStorage(){ + return getContextValue(RegionStorage.class); +} +public void setTreeModel(){ + if (getRegion() != null){ + getCardlayoutPrincipal().show(inputPanePrincipal,"normale"); + String regionName = getRegion().getName(); + setContextValue(getRegion()); + NavigationTreeModel model = SensitivityNavigationTreeSelectionAdapter.getTreeModel(regionName, getRegion()); + navigation.setSelectionModel(navigationSelectionModel); + navigation.setCellRenderer(new NavigationTreeCellRenderer(this)); + + setContextValue(model); + navigation.setModel(model); + new SensitivityNavigationTreeSelectionAdapter(this, true); + setTreeSelection("$root"); + } +} +public void repaintNode(String path){ + NavigationTreeModel model = getContextValue(NavigationTreeModel.class); + NavigationTreeNode currentNode = model.findNode(path); + model.nodeChanged(currentNode); +} +public void setTreeSelection(String path){ + NavigationTreeNode node = NavigationUtil.findNode(this, null, path); + TreePath pathToRoot = new TreePath(getContextValue(NavigationTreeModel.class).getPathToRoot(node)); + navigation.setSelectionPath(pathToRoot); + navigation.scrollPathToVisible(pathToRoot); +} +protected void setInfoText(String s){ + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setInfoText(s); +} +protected void regionNull(){ + getCardlayoutPrincipal().show(inputPanePrincipal,"none"); + DefaultTreeModel model = new DefaultTreeModel(null); + navigation.setModel(model); +} + ]]> + </script> + <JSplitPane oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> + <JPanel layout='{new BorderLayout()}'> + <JSplitPane oneTouchExpandable="true" dividerLocation="400" orientation="VERTICAL" constraints='BorderLayout.CENTER'> + <Table> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTree id="navigation" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + </JScrollPane> + </cell> + </row> + </Table> + <JPanel id="factorPanel" name="factorPanel" layout='{new BorderLayout()}'> + <JScrollPane constraints='BorderLayout.CENTER'> + <JTree id="factors" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/> + </JScrollPane> + </JPanel> + </JSplitPane> + </JPanel> + <JPanel id='inputPanePrincipal' layout='{getCardlayoutPrincipal()}'> + <fr.ifremer.isisfish.ui.input.NoneUI id='noneUI' constraints='"none"'/> + <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> + </JPanel> + </JSplitPane> +</JPanel> \ No newline at end of file Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,56 @@ + +<JPanel layout='{new BorderLayout()}'> + <script><![CDATA[ + import fr.ifremer.isisfish.ui.simulator.SimulAction; + import fr.ifremer.isisfish.ui.result.ResultAction; + import jaxx.runtime.JAXXInitialContext; + import fr.ifremer.isisfish.ui.input.InputAction; + import fr.ifremer.isisfish.ui.input.InputSaveVerifier; + import fr.ifremer.isisfish.ui.simulator.ParamsUI; + import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; + + public void selTab(int i){ + sensitivityTabs.setSelectedIndex(i); + } + ]]> + </script> + <JTabbedPane id="sensitivityTabs" constraints="BorderLayout.CENTER"> + <tab title='isisfish.params.title'> + <ParamsUI id='paramsUI' constructorParams='new SimulAction()'/> + </tab> + <tab title='isisfish.sensitivity.title'> + <SensitivityTabUI id="sensitivityTabUI" constructorParams='new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(this)'/> + </tab> + </JTabbedPane> +</JPanel> Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,54 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package fr.ifremer.isisfish.ui.util; + +import java.io.InputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; + +/** + * + * @author letellier + */ +public class UtilsUI { + + private static final Log log = LogFactory.getLog(UtilsUI.class); + static final String propertiesPath = "/sensitivity.properties"; + + static public boolean isSensitivity(String sens){ + Properties data = loadProperties(); + System.out.println(sens + " " + data.getProperty(sens)); + return data.getProperty(sens) != null; + + } + + private static Properties loadProperties(){ + InputStream stream = null; + Properties data = null; + try { + stream = UtilsUI.class.getResourceAsStream(propertiesPath); + data = new Properties(); + data.load(stream); + } catch (IOException ex) { + Logger.getLogger(UtilsUI.class.getName()).log(Level.SEVERE, null, ex); + } finally{ + try { + stream.close(); + } catch (IOException ex) { + Logger.getLogger(UtilsUI.class.getName()).log(Level.SEVERE, null, ex); + } + } + return data; + } +} Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-03 17:19:21 UTC (rev 1905) @@ -841,6 +841,7 @@ isisfish.sensWizardPanels.validate=Validate isisfish.sensWizardPanels.values=Values isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.title=Sensitivities input isisfish.server.ssh.generateKey.title=Generate Ssh key isisfish.setOfVessels.comments=Comments isisfish.setOfVessels.fixedCosts=Fixed costs Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-03 10:47:43 UTC (rev 1904) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-03 17:19:21 UTC (rev 1905) @@ -841,6 +841,7 @@ isisfish.sensWizardPanels.validate=Valider isisfish.sensWizardPanels.values=Valeurs isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.title=Saisie des sensibilit\u00E9s isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH isisfish.setOfVessels.comments=Commentaires isisfish.setOfVessels.fixedCosts=Co\u00FBts fixes Added: isis-fish/trunk/src/main/resources/images/Queue.gif =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/images/Queue.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/images/sensitivities.gif =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/resources/images/sensitivities.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: isis-fish/trunk/src/main/resources/sensitivity.properties =================================================================== --- isis-fish/trunk/src/main/resources/sensitivity.properties (rev 0) +++ isis-fish/trunk/src/main/resources/sensitivity.properties 2009-03-03 17:19:21 UTC (rev 1905) @@ -0,0 +1,82 @@ +Cell.Latitude +Cell.Longitude +Cell.Land +Cell.Comment +EffortDescription.FishingOperation +EffortDescription.FishingOperationDuration +EffortDescription.GearsNumberPerOperation +EffortDescription.CrewSize +EffortDescription.UnitCostOfFishing +EffortDescription.FixedCrewSalary +EffortDescription.CrewFoodCost +EffortDescription.CrewShareRate +EffortDescription.RepairAndMaintenanceGearCost +EffortDescription.LandingCosts +EffortDescription.OtherRunningCost +Gear.Name +Gear.EffortUnit +Gear.StandardisationFactor +Gear.ParameterName +Gear.PossibleValue +Gear.Comment +Metier.Name +Metier.GearParameterValue +Metier.Comment +Population.Name +Population.GeographicId +Population.PlusGroup +Population.Comment +Population.Capturability +Population.CapturabilityComment +PopulationGroup.MeanWeight +PopulationGroup.Price +Population.NaturalDeathRateMatrix +PopulationGroup.ReproductionRate +PopulationGroup.Age +PopulationGroup.MinLength +PopulationGroup.MaxLength +PopulationGroup.Comment +PopulationSeasonInfo.EmigrationMatrix +PopulationSeasonInfo.ImmigrationMatrix +PopulationSeasonInfo.MigrationMatrix +PopulationSeasonInfo.UseEquationMigration +Population.MigrationComment +Population.MonthGapBetweenReproRecrutement +Population.RecruitmentDistribution +Population.RecruitmentComment +StrategyMonthInfo.LengthChangeMatrix +Population.SeasonsComment +Port.Name +Port.Cell +Port.Comment +SetOfVessels.Name +SetOfVessels.NumberOfVessels +SetOfVessels.FixedCosts +SetOfVessels.Comment +Species.Name +Species.ScientificName +Species.CodeRubbin +Species.CodeCEE +Species.AgeGroupType +Species.AgeGroupType +Species.Comment +StrategyMonthInfo.NumberOfTrips +StrategyMonthInfo.ProportionMetier +Strategy.Name +Strategy.ProportionSetOfVessels +Strategy.InactivityEquationUsed +Strategy.Comment +TripType.Name +TripType.TripDuration +TripType.MinTimeBetweenTrip +TripType.Comment +VesselType.Name +VesselType.Length +VesselType.Speed +VesselType.MaxTripDuration +VesselType.ActivityRange +VesselType.MinCrewSize +VesselType.UnitFuelCostOfTravel +VesselType.TripType +VesselType.Comment +Zone.Cell \ No newline at end of file

1 0