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

r2079 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 07 Apr '09

07 Apr '09

Author: chatellier Date: 2009-04-07 10:22:14 +0000 (Tue, 07 Apr 2009) New Revision: 2079 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: simultation > simulation 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-04-07 10:17:25 UTC (rev 2078) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-04-07 10:22:14 UTC (rev 2079) @@ -846,7 +846,7 @@ throws SimulationException { try { File tmpDirectory = FileUtil.createTempDirectory( - "isisfish-simultation-", "-preparation"); + "isisfish-simulation-", "-preparation"); //File regionXML = IsisConfig.getDataBackupFile(tmpDirectory); File regionXML = new File(tmpDirectory, SimulationStorage.DATA_BACKUP_FILENAME);

1 0

r2078 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 07 Apr '09

07 Apr '09

Author: chatellier Date: 2009-04-07 10:17:25 +0000 (Tue, 07 Apr 2009) New Revision: 2078 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: simultation > simulation 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-04-07 09:37:53 UTC (rev 2077) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-04-07 10:17:25 UTC (rev 2078) @@ -723,7 +723,7 @@ param.setAnalysePlanNumber(planNumber); File tmpDirectory = FileUtil.createTempDirectory( - "isisfish-simultation-", "-preparation"); + "isisfish-simulation-", "-preparation"); SimulationStorage sim = SimulationStorage .importAndRenameZip(tmpDirectory, job .getItem().getSimulationZip(),

1 0

r2077 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 07 Apr '09

07 Apr '09

Author: chatellier Date: 2009-04-07 09:37:53 +0000 (Tue, 07 Apr 2009) New Revision: 2077 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java Log: Update documentation Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2009-04-06 17:02:39 UTC (rev 2076) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2009-04-07 09:37:53 UTC (rev 2077) @@ -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. ##% */ -/******************************************************************************* - * CodeSourceStorage.java - * - * Created: 21 janv. 2006 15:20:24 - * - * @author poussin - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package fr.ifremer.isisfish.datastore; import fr.ifremer.isisfish.IsisFishException; @@ -40,33 +28,38 @@ import java.io.PrintWriter; /** - * Classes abstraite permettant la gestion des fichiers de code source + * Classes abstraite permettant la gestion des fichiers de code source. + * + * Exemple : * {@link fr.ifremer.isisfish.datastore.ScriptStorage}, * {@link fr.ifremer.isisfish.datastore.RuleStorage}, * {@link fr.ifremer.isisfish.datastore.ExportStorage} + * {@link fr.ifremer.isisfish.datastore.SensitivityStorage} + * {@link fr.ifremer.isisfish.datastore.AnalysePlanStorage} * * @author poussin * + * @version $Revision$ + * + * Last update: $Date$ by : $Author$ */ - public abstract class JavaSourceStorage extends CodeSourceStorage { /** - * Contruit un nouveau rule storage + * Build a new java source storage. * - * @param rootSrc repertoire racine des sources - * @param directory le repertoire ou devrait se trouver la classe. Ce - * répertoire doit etre un sous répertoire de rootSrc - * @param name le nom de la classe + * @param rootSrc sources root directory + * @param directory class location directory (rootSrc subdirectory) + * @param name class name */ protected JavaSourceStorage(File rootSrc, File directory, String name) { super(rootSrc, directory, name, ".java"); } /** - * Retourne le nom complet de la class representant la classe package inclus + * Return class fully qualified name. * - * @return le nom complet avec le package + * @return class name including package name */ public String getFQN() { String root = getRoot().getAbsolutePath(); @@ -79,11 +72,21 @@ if (result.endsWith(".java")) { result = result.substring(0, result.length() - ".java".length()); } - + return result; } /** + * Retourne le nom de la classe (sans le package) a partir d'un objet. + * + * @param instance l'instance dont on veut le nom + * @return le nom de la classe ou null si instance est null + */ + public static String getName(Object instance) { + return ClassUtils.getShortClassName(instance, null); + } + + /** * Compile cette classe dans le répertoire par defaut de compilation * ({@link fr.ifremer.isisfish.IsisConfig#getCompileDirectory()}) * @@ -92,25 +95,26 @@ * @param out le flux sur lequel le resultat de la compilation doit * apparaitre. Peut-etre null, dans ce cas les sorties standards sont * utilisées. - * @return 0 si la compilation a reussi une autre valeur sinon + * @return 0 si la compilation a reussi, une autre valeur sinon */ public int compile(boolean force, PrintWriter out) { - return CompileHelper.compile(this, IsisFish.config.getCompileDirectory(), force, out); + return CompileHelper.compile(this, IsisFish.config + .getCompileDirectory(), force, out); } /** - * Retourne la classe de la rule compilé. Compile le fichier si besoin + * Retourne la classe compilée. Compile le fichier si besoin. * - * @return la class representant la regle + * @return la class * @throws IsisFishException */ - public Class getCodeClass() throws IsisFishException { + public Class<?> getCodeClass() throws IsisFishException { String fqn = getFQN(); -// Class result = CompileHelper.loadClass(fqn); -// if (result == null) { + // Class result = CompileHelper.loadClass(fqn); + // if (result == null) { compile(false, null); - Class result = CompileHelper.loadClass(fqn); -// } + Class<?> result = CompileHelper.loadClass(fqn); + // } if (result == null) { throw new IsisFishException(_("isisfish.error.load.class", fqn)); } @@ -118,13 +122,13 @@ } /** - * Retourne une nouvelle instance de la regle. Compile le fichier si besoin + * Retourne une nouvelle instance de la class. Compile le fichier si besoin. * - * @return une novuelle instance de la regle - * @throws IsisFishException + * @return une nouvelle instance de la class + * @throws IsisFishException if can't make new instance */ public Object getNewInstance() throws IsisFishException { - Class clazz = getCodeClass(); + Class<?> clazz = getCodeClass(); Object result; try { result = clazz.newInstance(); @@ -137,15 +141,4 @@ } return result; } - - /** - * Retourne le nom de la classe (sans le package) a partir d'un objet. - * - * @param instance l'instance dont on veut le nom - * @return le nom de la classe ou null si instance est null - */ - static public String getName(Object instance) { - return ClassUtils.getShortClassName(instance, null); - } - }

1 0

r2076 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 17:02:39 +0000 (Mon, 06 Apr 2009) New Revision: 2076 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java Log: Fix classpath (search with manifest file from first jar) 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-04-06 15:19:21 UTC (rev 2075) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-04-06 17:02:39 UTC (rev 2076) @@ -41,6 +41,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.util.FileUtil; +import org.codelutin.util.Resource; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.datastore.JavaSourceStorage; @@ -165,7 +166,7 @@ result = compile(classpath, src, dest, out); } catch (Exception eee) { if (log.isWarnEnabled()) { - log.warn("Compilation faild", eee); + log.warn("Compilation failed", eee); } } return result; @@ -222,16 +223,32 @@ String result = StringUtils.join(classpath.iterator(), File.pathSeparator) + File.pathSeparator + System.getProperty("java.class.path"); - + if (log.isDebugEnabled()) { + log.debug("Result : " + result); + } + // Ajout des jars for (Enumeration<?> e = CompileHelper.class.getClassLoader() .getResources("META-INF/MANIFEST.MF"); e.hasMoreElements();) { URL url = (URL) e.nextElement(); + if (log.isDebugEnabled()) { + log.debug("Found manifest : " + url); + } if ((url != null) && url.getFile().startsWith("file:/")) { String jarName = url.getPath().substring(5, url.getPath().indexOf("!")); if (!result.contains(jarName)) { result += File.pathSeparator + jarName; + + // FIX to launch isis with java -jar + URL jarURL = new URL("jar",null,jarName); + URL[] urls = Resource.getClassPathURLsFromJarManifest(jarURL); + for (URL url2 : urls) { + String jarName2 = url2.getFile(); + if (!result.contains(jarName2)) { + result += File.pathSeparator + jarName2; + } + } } } }

1 0

r2075 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 15:19:21 +0000 (Mon, 06 Apr 2009) New Revision: 2075 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Replace java.util.logger by commons-logging logger Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-06 14:23:13 UTC (rev 2074) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-04-06 15:19:21 UTC (rev 2075) @@ -37,8 +37,6 @@ import java.util.Properties; import java.util.SortedMap; import java.util.TreeMap; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.JComponent; @@ -152,7 +150,9 @@ param.setResultEnabled(resultNames); } } catch (Exception eee) { - log.error("Can't init SimulationParameter", eee); + if (log.isErrorEnabled()) { + log.error("Can't init SimulationParameter", eee); + } showMsgBox(eee); } } @@ -169,17 +169,19 @@ proper.load(fos); param.fromProperties(SimulationStorage.getSimulationDirectory(), proper); - } catch (Exception ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't import simulation", e); + } + showMsgBox(e); } finally { try { fos.close(); - } catch (IOException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't import simulation", e); + } + showMsgBox(e); } } } @@ -189,17 +191,19 @@ try { fos = new FileOutputStream(f); param.copy().toProperties().store(fos, simulName); - } catch (Exception ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't save simulation", e); + } + showMsgBox(e); } finally { try { fos.close(); - } catch (IOException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't save simulation", e); + } + showMsgBox(e); } } } @@ -231,8 +235,10 @@ protected void stopSimulation(SimulationJob job) { job.stop(); - log.info(_("User stop simulation %s", job.getItem().getControl() + if (log.isInfoEnabled()) { + log.info(_("User stop simulation %s", job.getItem().getControl() .getId())); + } } protected void viewLog(SimulationJob job) { @@ -262,8 +268,11 @@ for (Rule r : param.getRules()) { rules.put(r, RuleStorage.getName(r)); } - } catch (Exception eee) { - showMsgBox(eee); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't change region", e); + } + showMsgBox(e); } } @@ -302,7 +311,9 @@ } } } catch (Exception eee) { - log.error("Can't load old Simulation: " + simulName, eee); + if (log.isErrorEnabled()) { + log.error("Can't load old Simulation: " + simulName, eee); + } showMsgBox(eee); } } @@ -320,10 +331,11 @@ Rule ruleTmp = ruleStorage.getNewRuleInstance(); rules.put(ruleTmp, name); param.addRule(ruleTmp); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't add rule", e); + } + showMsgBox(e); } } @@ -340,10 +352,11 @@ for (Rule r : param.getRules()) { try { result.add(RuleStorage.getName(r)); - } catch (Exception ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't get rules", e); + } + showMsgBox(e); } } return result; @@ -387,10 +400,11 @@ try { result = RuleStorage.getParameterValue(getRule(ruleName), paramName); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't get rule param value", e); + } + showMsgBox(e); } } return result; @@ -401,10 +415,11 @@ if (ruleName != null) { try { RuleStorage.setParameterValue(getRule(ruleName), paramName, o); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't set rule param value", e); + } + showMsgBox(e); } } } @@ -418,10 +433,11 @@ result = RegionStorage.getFisheryRegion(tx).getStrategy(); tx.rollbackTransaction(); tx.closeContext(); - } catch (Exception ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't get strategies", e); + } + showMsgBox(e); } return result; } @@ -456,10 +472,11 @@ } tx.rollbackTransaction(); tx.closeContext(); - } catch (Exception ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Can't get population", e); + } + showMsgBox(e); } return result; } @@ -511,14 +528,16 @@ oldSimulNames.add(0, " "); return oldSimulNames; - } catch (ParseException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); - } catch (IOException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (ParseException e) { + if (log.isErrorEnabled()) { + log.error("Can't get old simulation item", e); + } + showMsgBox(e); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Can't get old simulation item", e); + } + showMsgBox(e); } return null; } @@ -580,9 +599,10 @@ if (!SensitivityExport.class.isInstance(exInstance)) { result.add(export); } - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't get export names", e); + } } } return result; @@ -634,10 +654,11 @@ AnalysePlan ap = AnalysePlanStorage.getAnalysePlan(name) .getNewAnalysePlanInstance(); getSimulationParameter().addAnalysePlan(ap); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't add analyse plan", e); + } + showMsgBox(e); } } @@ -662,10 +683,11 @@ if (ap != null) { try { result = AnalysePlanStorage.getParameterValue(ap, paramName); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't get analyse plan param value", e); + } + showMsgBox(e); } } return result; @@ -679,10 +701,11 @@ } try { AnalysePlanStorage.setParameterValue(ap, paramName, value); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't set analyse plan param value", e); + } + showMsgBox(e); } } @@ -700,9 +723,10 @@ if (SensitivityExport.class.isInstance(exInstance)) { result.add(export); } - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't get sensitivity export names", e); + } } } return result; @@ -724,9 +748,10 @@ .getNewExportInstance(); sensitivityExports.put(exInstance, name); param.setSensitivityExport(getSensitivityExportList()); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't add sensitivity export", e); + } } } @@ -784,9 +809,10 @@ try { SensitivityStorage sens = SensitivityStorage.getSensitivity(name); result = sens.getParameterNames(); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't get sensitivity sensitivity params names", e); + } } return result; } @@ -796,10 +822,11 @@ try { result = SensitivityStorage.getParameterValue(param .getSensitivityCalculator(), paramName); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't get sensitivity param value", e); + } + showMsgBox(e); } return result; } @@ -811,10 +838,11 @@ SensitivityStorage.setParameterValue(param .getSensitivityCalculator(), paramName, value); } - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); - showMsgBox(ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't set sensitivity param value", e); + } + showMsgBox(e); } } @@ -829,9 +857,10 @@ .getNewSensitivityInstance(); sensitivityCalculator = sensCal; param.setSensitivityCalculator(sensitivityCalculator); - } catch (IsisFishException ex) { - Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, - null, ex); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't set sensitivity", e); + } } } @@ -882,8 +911,9 @@ f.setDomain(domain); f.setComment(comment); f.setPath(path); - if (exist) + if (exist) { removeFactor(f); + } addFactor(f, c); } @@ -910,8 +940,9 @@ f.setComment(comment); f.setDomain(domain); f.setPath(path); - if (exist) + if (exist) { removeFactor(f); + } addFactor(f, c); }

1 0

r2074 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/sensitivity resources/i18n
by sletellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: sletellier Date: 2009-04-06 14:23:13 +0000 (Mon, 06 Apr 2009) New Revision: 2074 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.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: Coeficient must be under 0 and 100 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-06 13:55:51 UTC (rev 2073) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-06 14:23:13 UTC (rev 2074) @@ -52,7 +52,7 @@ import java.util.regex.Pattern; import org.apache.commons.lang.StringUtils; -protected String[] columnNames = {"Name", "Value", "Coef", "Operator", "Action"}; +protected String[] columnNames = {"Name", "Value", "Coef (in %)", "Operator", "Action"}; protected java.util.List<EquationContinuousDomain> datas = new ArrayList<EquationContinuousDomain>(); protected java.util.List<JComboBox> operateurs = new ArrayList<JComboBox>(); protected java.util.List<JButton> actions = new ArrayList<JButton>(); @@ -94,7 +94,7 @@ } else if (columnIndex == 1){ return datas.get(rowIndex).getReferenceValue(); } else if (columnIndex == 2){ - return datas.get(rowIndex).getCoefficient(); + return datas.get(rowIndex).getCoefficient() == null ? 100 : datas.get(rowIndex).getCoefficient() * 100; } else if (columnIndex == 3){ return datas.get(rowIndex).getOperator(); } else if (columnIndex == 4){ @@ -112,7 +112,7 @@ } else if (columnIndex == 1){ datas.get(rowIndex).setReferenceValue(Double.parseDouble((String)aValue)); } else if (columnIndex == 2){ - datas.get(rowIndex).setCoefficient(Double.parseDouble((String)aValue)); + datas.get(rowIndex).setCoefficient(Double.parseDouble((String)aValue) / 100); } else if (columnIndex == 3){ datas.get(rowIndex).setOperator((String)aValue); } Modified: 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 2009-04-06 13:55:51 UTC (rev 2073) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-04-06 14:23:13 UTC (rev 2074) @@ -68,14 +68,11 @@ List<EquationContinuousDomain> domains = equationPanel.getDomains(); for (EquationContinuousDomain domain : domains) { - if (domain.getCoefficient() != null && domain.getCoefficient() == 1){ - JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.coefValueIsOne")); - } - else if (domain.getReferenceValue() != null && domain.getCoefficient() != null && domain.getCoefficient() < 1 && domain.getCoefficient() > 0 && domain.getOperator() != null && domain.getVariableName() != null ){ + if (domain.getReferenceValue() != null && domain.getCoefficient() != null && domain.getCoefficient() <= 100 && domain.getCoefficient() > 0 && domain.getOperator() != null && domain.getVariableName() != null ){ action.addContinuousEquationFactor(name, comment, path, domain, cOrigine, exist); } else { - JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.invalid")); + JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.invalid") + domain.getVariableName()); } } } catch (Exception ex) { 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-04-06 13:55:51 UTC (rev 2073) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-06 14:23:13 UTC (rev 2074) @@ -252,7 +252,7 @@ isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.coefValueIsOne=Coefficient can't be equal to 1 -isisfish.error.factor.invalid=Factor is not valid +isisfish.error.factor.invalid=Factor is not valid \: isisfish.error.file.already.exists=The file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population 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-04-06 13:55:51 UTC (rev 2073) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-06 14:23:13 UTC (rev 2074) @@ -252,8 +252,8 @@ isisfish.error.evaluate.equation=Can't evaluate equation\: %1$s isisfish.error.evalute.plan.script=Can't evaluate plan script isisfish.error.factor.coefValueIsOne=Un co\u00E9fficient ne peux pas \u00EAtre \u00E9gual \u00E0 1 -isisfish.error.factor.invalid=Le facteur n'est pas valide -isisfish.error.file.already.exists=The file %1$s already exist +isisfish.error.factor.invalid=Le facteur n'est pas valide \: +isisfish.error.file.already.exists\=The=file %1$s already exist isisfish.error.get.fisheryRegion=Can't get FisheryRegion isisfish.error.growth.equation.before.create.group.population=Error, You must input growth equation before create the group population isisfish.error.immigration.negative=immigration negative

1 0

r2073 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by sletellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: sletellier Date: 2009-04-06 13:55:51 +0000 (Mon, 06 Apr 2009) New Revision: 2073 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java Log: Coeficient must be under 0 and 1 Modified: 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 2009-04-06 13:50:08 UTC (rev 2072) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-04-06 13:55:51 UTC (rev 2073) @@ -71,7 +71,7 @@ if (domain.getCoefficient() != null && domain.getCoefficient() == 1){ JOptionPane.showMessageDialog(equationPanel, _("isisfish.error.factor.coefValueIsOne")); } - else if (domain.getReferenceValue() != null && domain.getCoefficient() != null && domain.getCoefficient() > 1 && domain.getOperator() != null && domain.getVariableName() != null ){ + else if (domain.getReferenceValue() != null && domain.getCoefficient() != null && domain.getCoefficient() < 1 && domain.getCoefficient() > 0 && domain.getOperator() != null && domain.getVariableName() != null ){ action.addContinuousEquationFactor(name, comment, path, domain, cOrigine, exist); } else {

1 0

r2072 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 13:50:08 +0000 (Mon, 06 Apr 2009) New Revision: 2072 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx Log: Readd default value as argument for getValueAndCompute Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-06 13:47:18 UTC (rev 2071) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-04-06 13:50:08 UTC (rev 2072) @@ -165,15 +165,16 @@ protected JButton getActionButton(int i){ return actions.get(i); } -protected void valid(int i){ +protected void valid(int i) { String variableName = datas.get(i).getVariableName(); String[] lines = editor.getEditor().getText().split("\n"); String result = ""; - for (String line : lines){ - Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*).*\\;$"); + for (String line : lines) { + Pattern p = Pattern.compile("(^.*\\s+" + variableName + "\\s*\\=\\s*)([\\d\\.]+).*\\;$"); Matcher matcher = p.matcher(line); if (matcher.find()) { - line = matcher.group(1) + "context.getValueAndCompute(\"" + bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName + "\");"; + String fullVariableName = bean.toString() + "." + StringUtils.uncapitalize(methodGet) + "." + variableName; + line = matcher.group(1) + "context.getValueAndCompute(\"" + fullVariableName + "\", " + matcher.group(2) + ");"; } result += line + "\n"; }

1 0

r2071 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by sletellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: sletellier Date: 2009-04-06 13:47:18 +0000 (Mon, 06 Apr 2009) New Revision: 2071 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx Log: Bug double JScrollPane fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-04-06 13:30:17 UTC (rev 2070) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-04-06 13:47:18 UTC (rev 2071) @@ -45,9 +45,9 @@ <JLabel text='isisfish.factor.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </cell> <cell fill='both' weightx='1' weighty='1'> - <JScrollPane> +  <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </JScrollPane> +  </cell> </row> <row>

1 0

r2070 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input resources/i18n
by chatellier＠users.labs.libre-entreprise.org 06 Apr '09

06 Apr '09

Author: chatellier Date: 2009-04-06 13:30:17 +0000 (Mon, 06 Apr 2009) New Revision: 2070 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/MetierSeasonInfoSpeciesEditorUI.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: #1810 : Serait-il possible d'afficher un message dans la case target factor de la table reprenant les differentes associations espece-saison du mtier. 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-04-06 08:39:21 UTC (rev 2069) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-04-06 13:30:17 UTC (rev 2070) @@ -660,16 +660,17 @@ return null; } - public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, Species species, String targetFactorEquation, boolean primaryCatch) { - if (log.isTraceEnabled()) { - log.trace("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquation); + public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, Species species, String targetFactorEquationName, String targetFactorEquationContent, boolean primaryCatch) { + if (log.isDebugEnabled()) { + log.debug("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquationContent); } try { TargetSpeciesDAO dao = IsisFishDAOHelper.getTargetSpeciesDAO(metier.getTopiaContext()); TargetSpecies targetSpecies = dao.create(); targetSpecies.setSpecies(species); - targetSpecies.getTargetFactorEquation().setContent(targetFactorEquation); + targetSpecies.getTargetFactorEquation().setName(targetFactorEquationName); + targetSpecies.getTargetFactorEquation().setContent(targetFactorEquationContent); targetSpecies.setPrimaryCatch(primaryCatch); m.addSpeciesTargetSpecies(targetSpecies); } catch (Exception eee) { @@ -680,8 +681,8 @@ } public Object removeTargetSpecies(MetierSeasonInfo m, TargetSpecies targetSpecies) { - if (log.isTraceEnabled()) { - log.trace("removeTargetSpecies called: " + targetSpecies); + if (log.isDebugEnabled()) { + log.debug("removeTargetSpecies called: " + targetSpecies); } try { if (targetSpecies != null) { @@ -697,8 +698,8 @@ // SetOfVessels public void addEffortDescription(SetOfVessels setOfVessels, Metier metier) { - if (log.isTraceEnabled()) { - log.trace("addEffortDescription called: " + setOfVessels + " metier: " + metier); + if (log.isDebugEnabled()) { + log.debug("addEffortDescription called: " + setOfVessels + " metier: " + metier); } try { EffortDescriptionDAO effortDescriptionPS = IsisFishDAOHelper.getEffortDescriptionDAO(metier.getTopiaContext()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-04-06 08:39:21 UTC (rev 2069) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-04-06 13:30:17 UTC (rev 2070) @@ -132,59 +132,61 @@ return result; } }; - if (getMetierInfo() != null){ + if (getMetierInfo() != null) { Collection<TargetSpecies> targetSpecies = ((MetierSeasonInfo)getMetierInfo()).getSpeciesTargetSpecies(); - if (targetSpecies != null){ - ArrayList <GenericCell> species = new ArrayList <GenericCell>(); - ArrayList <Equation> equations = new ArrayList <Equation>(); - ArrayList <Boolean> primaryCatch = new ArrayList <Boolean>(); - for (TargetSpecies t : targetSpecies){ + if (targetSpecies != null) { + java.util.List<GenericCell> species = new ArrayList <GenericCell>(); + java.util.List<Equation> equations = new ArrayList <Equation>(); + java.util.List<Boolean> primaryCatch = new ArrayList <Boolean>(); + for (TargetSpecies t : targetSpecies) { Species s = t.getSpecies(); Equation e = t.getTargetFactorEquation(); Boolean b = t.getPrimaryCatch(); - species.add(new GenericCell(s.getName(),s,Species.class)); + species.add(new GenericCell(s.getName(), s, Species.class)); equations.add(e); primaryCatch.add(b); } - model.addColumn("Species", species.toArray()); - model.addColumn("Target factor", equations.toArray()); - model.addColumn("Main species for the metier", primaryCatch.toArray()); + model.addColumn(_("isisfish.metierSeasonInfoSpecies.species"), species.toArray()); + model.addColumn(_("isisfish.metierSeasonInfoSpecies.targetFactor"), equations.toArray()); + model.addColumn(_("isisfish.metierSeasonInfoSpecies.mainSpecies"), primaryCatch.toArray()); } tableTargetSpecies.setModel(model); EquationTableEditor cellEditor = new EquationTableEditor(); tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor); } } -protected void add(){ +protected void add() { Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); - if (getMetierInfo() != null && species != null){ + if (getMetierInfo() != null && species != null) { + Formule selectedFormule = (Formule)targetFactor.getCombo().getSelectedItem(); getContextValue(InputAction.class).addTargetSpecies( getBean(), (MetierSeasonInfo)getMetierInfo(), (Species)species, + selectedFormule.getName(), targetFactor.getEditor().getText(), fieldPrimaryCatch.isSelected()); setTableTargetSpeciesModel(); } } -protected void remove(){ - if (isMetierSeasonSelected()){ +protected void remove() { + if (isMetierSeasonSelected()) { Object[] targetSpecies = getMetierInfo().getSpeciesTargetSpecies().toArray(); Object o = targetSpecies[tableTargetSpecies.getSelectedRow()]; - if (o != null){ + if (o != null) { TargetSpecies ts = (TargetSpecies)o; getAction().removeTargetSpecies(getMetierInfo(), ts); setTableTargetSpeciesModel(); } } } -protected void targetSpeciesChanged(){ +protected void targetSpeciesChanged() { setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null); setTableTargetSpeciesModel(); setAddButton(); } -protected void setAddButton(){ +protected void setAddButton() { add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected()); } ]]></script> 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-04-06 08:39:21 UTC (rev 2069) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-04-06 13:30:17 UTC (rev 2070) @@ -611,7 +611,8 @@ isisfish.metierSeasonInfoSpecies.mainSpecies=Main species for the metier isisfish.metierSeasonInfoSpecies.selectSeason=Select a season isisfish.metierSeasonInfoSpecies.selectSpecies=Select a species -isisfish.metierSeasonInfoSpecies.targetFactor=TargetFactor +isisfish.metierSeasonInfoSpecies.species=Species +isisfish.metierSeasonInfoSpecies.targetFactor=Target factor isisfish.metierSeasonInfoSpecies.title=Catchable species isisfish.metierSeasonInfoZone.comments=Comments isisfish.metierSeasonInfoZone.season=Season 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-04-06 08:39:21 UTC (rev 2069) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-04-06 13:30:17 UTC (rev 2070) @@ -611,6 +611,7 @@ isisfish.metierSeasonInfoSpecies.mainSpecies=Esp\u00E8ces principales pour le m\u00E9tier isisfish.metierSeasonInfoSpecies.selectSeason=S\u00E9lectionnez une saison isisfish.metierSeasonInfoSpecies.selectSpecies=Choix de l'esp\u00E8ce +isisfish.metierSeasonInfoSpecies.species=Esp\u00E8ce isisfish.metierSeasonInfoSpecies.targetFactor=Facteur cible isisfish.metierSeasonInfoSpecies.title=Esp\u00E8ces capturables isisfish.metierSeasonInfoZone.comments=Commentaires

1 0