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

r2936 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 15:38:16 +0000 (Fri, 22 Jan 2010) New Revision: 2936 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/MetierSeasonInfoSpeciesEditorUI.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/PopulationBasicsUI.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/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/PopulationRecruitmentUI.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/SelectivityEditorUI.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/SetOfVesselsBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Log: Simplify input one equation ui. Use less parameters based on conventions. 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 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@  - <fr.ifremer.isisfish.ui.input.InputContentUI> -  - <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> - <String id='lblText' javaBean='null'/> +  + <String id='text' javaBean='null'/> +  <org.nuiton.topia.persistence.TopiaEntity id='bean' javaBean='null'/> +  + <String id='beanProperty' javaBean='null'/> +  <Class id='clazz' javaBean='null'/> - <String id='methodGet' javaBean='null'/> - <String id='methodSet' javaBean='null'/> - <String id='nameEquation' javaBean='null'/> + +  + <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> +  + <String id='formuleCategory' javaBean='null'/> +  <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/> <script><![CDATA[ +import java.lang.reflect.Method; +import java.io.File; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.ui.input.formule.FormuleComboModel; -import java.lang.reflect.Method; +import org.apache.commons.lang.StringUtils; import org.nuiton.topia.TopiaContext; -import jaxx.runtime.swing.Item; protected DocumentListener listener = null; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); formuleComboBox.setModel(new DefaultComboBoxModel()); try { editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java")); @@ -56,10 +60,6 @@ } } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - //setComboModel(); - // chatellier 20090526 : force refresh in bean change ? refresh(); } @@ -88,12 +88,19 @@ setComboModel(); editor.getCurrentEditor().addDocumentListener(listener); } + +/** + * Get equation on entity. + */ protected Equation getEquation() { Equation result = null; try { - if (bean != null && methodGet != null){ - Method m = bean.getClass().getMethod("get" + methodGet, null); - result = (Equation) m.invoke(bean, (Object[])null); + // can be null in some uis + // content is managed by caller, can do anythings here + if (bean != null && beanProperty != null) { + String localBeanProperty = StringUtils.capitalize(beanProperty); + Method m = bean.getClass().getMethod("get" + localBeanProperty, null); + result = (Equation)m.invoke(bean); } } catch (Exception e) { if (log.isErrorEnabled()) { @@ -102,30 +109,53 @@ } return result; } -protected void setEquation(){ + +/** + * Call setXXXContent on topia entity (convention). + */ +protected void setEquation() { try { - if (bean != null && methodSet != null) { - Method m = bean.getClass().getMethod("set" + methodSet, String.class); + // can be null in some uis + // content is managed by caller, can do anythings here + if (bean != null && beanProperty != null) { + if (log.isDebugEnabled()) { + log.debug("Saving equation content (" + bean.getClass().getSimpleName() + + "#" + beanProperty + ")"); + } + String localBeanProperty = StringUtils.capitalize(beanProperty); + Method m = bean.getClass().getMethod("set" + localBeanProperty + "Content", String.class); m.invoke(bean, editor.getText()); } + else { + if (log.isDebugEnabled()) { + log.debug("No bean property defined, skipping content saving"); + } + } } catch (Exception e) { if (log.isErrorEnabled()) { - log.error("Can't set equation", e); + log.error("Can't set equation content", e); } } } @Override -public void refresh(){ +public void refresh() { + + // TODO binding don't work + if (getText() == null) { + setText(_("isisfish.common.equation")); + } + editor.getCurrentEditor().removeDocumentListener(listener); try { - editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java")); + File equationContentFile = org.nuiton.util.FileUtil.getTempFile("", ".java"); + editor.open(equationContentFile); } catch (IOException ex) { if (log.isErrorEnabled()) { log.error("Can't refresh editor", ex); } } - if (nameEquation != null){ + if (formuleCategory != null) { // chatellier 20090526 (change to get combo selected on this equation) selectedEquation = getEquation(); setComboModel(); @@ -134,7 +164,7 @@ } editor.getCurrentEditor().addDocumentListener(listener); } - + @Override public void setActionButtons() { @@ -144,8 +174,8 @@ if (getBean() != null){ TopiaContext isisContext = getBean().getTopiaContext(); java.util.List<Formule> formules = null; - if (nameEquation != null) { - formules = getAction().getFormules(isisContext, nameEquation); + if (formuleCategory != null) { + formules = getAction().getFormules(isisContext, formuleCategory); FormuleComboModel formulesModel = new FormuleComboModel(formules); formuleComboBox.setModel(formulesModel); // fix default selection @@ -154,17 +184,21 @@ } } protected void saveModel() { - getContextValue(InputAction.class).saveAsModel(nameEquation, "Java", editor.getText()); + getContextValue(InputAction.class).saveAsModel(formuleCategory, "Java", editor.getText()); setComboModel(); setInfoText(_("isisfish.message.saveModel.finished")); } + +/** + * Open external editor, with equation documentation. + */ protected void openEditor() { Formule e = (Formule)formuleComboBox.getSelectedItem(); if (e != null) { - getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), clazz, e.getContent(), editor); + getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(), clazz, e.getContent(), editor); } else { - getContextValue(InputAction.class).openEditor(nameEquation, "new", clazz, editor.getText(), editor); + getContextValue(InputAction.class).openEditor(formuleCategory, "new", clazz, editor.getText(), editor); } } protected void setEditorText() { @@ -182,6 +216,9 @@ } } +/** + * New formule selected, replace content. + */ protected void formuleChanged() { Formule selectedFormule = (Formule)formuleComboBox.getSelectedItem(); setFormule(selectedFormule); @@ -192,7 +229,7 @@ <Table> <row> <cell fill='horizontal' anchor='east'> - <JLabel id='lbl' text='{getLblText()}' enabled='{isActif()}'/> + <JLabel text='{getText()}' enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="formuleComboBox" onActionPerformed='formuleChanged()' enabled='{isActif()}' @@ -204,12 +241,12 @@ <Table> <row> <cell fill='horizontal'> - <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()' enabled='{isActif()}'/> + <JButton text="isisfish.common.saveModel" onActionPerformed='saveModel()' enabled='{isActif() && formuleCategory != null}'/> </cell> </row> <row> <cell fill='horizontal'> - <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif()}'/> + <JButton text="isisfish.common.openEditor" onActionPerformed='openEditor()' enabled='{isActif() && clazz != null && formuleCategory != null}'/> </cell> </row> <row> 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 2010-01-22 15:37:21 UTC (rev 2935) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2010-01-22 15:38:16 UTC (rev 2936) @@ -1,6 +1,6 @@  </cell>

1 0

r2935 - in isis-fish/trunk/src: main/java/fr/ifremer/isisfish/datastore/update main/java/fr/ifremer/isisfish/entities test/java/fr/ifremer/isisfish/entity
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 15:37:21 +0000 (Fri, 22 Jan 2010) New Revision: 2935 Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java Log: Change all equation content setter on entity to a common convention. add a test on it. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2010-01-22 15:24:53 UTC (rev 2934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2010-01-22 15:37:21 UTC (rev 2935) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -502,13 +502,13 @@ pop3.setName(getStringValue(pop, "nom")); pop3.setGeographicId(getStringValue(pop, "idGeographique")); pop3.setPlusGroup(getBoolValue(pop, "classePlus")); - pop3.setEquationGrowth(getEquationStringValue(pop, "croissance")); + pop3.setGrowthContent(getEquationStringValue(pop, "croissance")); convertEquation(pop3.getGrowth(), getStringValue(pop, "croissance")); - pop3.setEquationGrowthReverse(getEquationStringValue(pop, "inverseCroissance")); + pop3.setGrowthReverseContent(getEquationStringValue(pop, "inverseCroissance")); convertEquation(pop3.getGrowthReverse(), getStringValue(pop, "inverseCroissance")); - pop3.setEquationNaturalDeathRate(getEquationStringValue(pop, "mortaliteNaturelleEquation")); + pop3.setNaturalDeathRateContent(getEquationStringValue(pop, "mortaliteNaturelleEquation")); convertEquation(pop3.getNaturalDeathRate(), getStringValue(pop, "mortaliteNaturelleEquation")); - pop3.setEquationReproductionEquation(getEquationStringValue(pop, "equationReproduction")); + pop3.setReproductionEquationContent(getEquationStringValue(pop, "equationReproduction")); convertEquation(pop3.getReproductionEquation(), getStringValue(pop, "equationReproduction")); pop3.setMonthGapBetweenReproRecrutement(getIntValue(pop, "nbMoisEntreReproRecrutement")); pop3.setRecruitmentDistribution(getMatrixValue(pop, "etalementRecrutement")); //TODO la semantique devrait etre: sem.add(_("isisfish.common.month", i)); @@ -580,12 +580,12 @@ eqMeanWeight += " default: return 0;\n" + " }\n"; - pop3.setEquationMeanWeight(eqMeanWeight); + pop3.setMeanWeightContent(eqMeanWeight); eqPrice += " default: return 0;\n" + " }\n"; - pop3.setEquationPrice(eqPrice); + pop3.setPriceContent(eqPrice); String seasonComment = ""; List<Node> infoSaisons = getListValue(pop, "infoSaison"); @@ -620,11 +620,11 @@ season.setReproductionDistribution(mat); if (season.getUseEquationMigration()) { - season.setMigrationEquationAsString(getEquationStringValue(infoSaison, "migrationEquation")); + season.setMigrationEquationContent(getEquationStringValue(infoSaison, "migrationEquation")); convertEquation(season.getMigrationEquation(), getStringValue(infoSaison, "migrationEquation")); - season.setEmigrationEquationAsString(getEquationStringValue(infoSaison, "emigrationEquation")); + season.setEmigrationEquationContent(getEquationStringValue(infoSaison, "emigrationEquation")); convertEquation(season.getEmigrationEquation(), getStringValue(infoSaison, "emigrationEquation")); - season.setImmigrationEquationAsString(getEquationStringValue(infoSaison, "immigrationEquation")); + season.setImmigrationEquationContent(getEquationStringValue(infoSaison, "immigrationEquation")); convertEquation(season.getImmigrationEquation(), getStringValue(infoSaison, "immigrationEquation")); } else { mat = season.getMigrationMatrix().copy(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2010-01-22 15:24:53 UTC (rev 2934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2010-01-22 15:37:21 UTC (rev 2935) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -87,7 +87,8 @@ } /** - * override to change name of equation + * Override to change name of equation. + * * @see fr.ifremer.isisfish.entities.PopulationAbstract#setName(java.lang.String) */ @Override @@ -124,7 +125,7 @@ } } - public void setEquationReproductionEquation(String content) { + public void setReproductionEquationContent(String content) { try { Equation eq = getReproductionEquation(); @@ -156,7 +157,7 @@ } } - public void setEquationGrowth(String content) { + public void setGrowthContent(String content) { try { Equation eq = getGrowth(); @@ -188,7 +189,7 @@ } } - public void setEquationGrowthReverse(String content) { + public void setGrowthReverseContent(String content) { try { Equation eq = getGrowthReverse(); @@ -220,7 +221,7 @@ } } - public void setEquationNaturalDeathRate(String content) { + public void setNaturalDeathRateContent(String content) { try { Equation eq = getNaturalDeathRate(); @@ -252,7 +253,7 @@ } } - public void setEquationMeanWeight(String content) { + public void setMeanWeightContent(String content) { try { Equation eq = getMeanWeight(); @@ -284,7 +285,7 @@ } } - public void setEquationPrice(String content) { + public void setPriceContent(String content) { try { Equation eq = getPrice(); @@ -480,14 +481,14 @@ List[] newsems = new List[]{getPopulationGroup(), getPopulationSeasonInfo(),}; - MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.population.capturability"), - newsems, - new String[] { n_("isisfish.population.group"), + MatrixND newmat = MatrixFactory.getInstance().create( + n_("isisfish.population.capturability"), + newsems, + new String[] { n_("isisfish.population.group"), n_("isisfish.population.season") }); newmat.paste(value); value = newmat; - } + } super.setCapturability(value); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2010-01-22 15:24:53 UTC (rev 2934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2010-01-22 15:37:21 UTC (rev 2935) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -681,7 +681,7 @@ return mat; } - public void setMigrationEquationAsString(String content) { + public void setMigrationEquationContent(String content) { try { Equation eq = getMigrationEquation(); @@ -715,7 +715,7 @@ } } - public void setEmigrationEquationAsString(String content) { + public void setEmigrationEquationContent(String content) { try { Equation eq = getEmigrationEquation(); @@ -749,7 +749,7 @@ } } - public void setImmigrationEquationAsString(String content) { + public void setImmigrationEquationContent(String content) { try { Equation eq = getImmigrationEquation(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2010-01-22 15:24:53 UTC (rev 2934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2010-01-22 15:37:21 UTC (rev 2935) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -19,6 +19,8 @@ package fr.ifremer.isisfish.entities; +import static org.nuiton.i18n.I18n._; + import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -42,7 +44,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.Selectivity#getCoefficient(double, double, fr.ifremer.isisfish.entities.Metier) */ public double getCoefficient(Population pop, PopulationGroup group, @@ -57,7 +59,7 @@ return result; } - /* (non-Javadoc) + /* * @see fr.ifremer.isisfish.entities.SelectivityAbstract#getEquation() */ @Override @@ -80,6 +82,32 @@ return super.getEquation(); } + /** + * Equation content setter for Equation. + * + * @param content content to set + */ + public void setEquationContent(String content) { + try { + Equation eq = getEquation(); + + // can't be null + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + + eq.setContent(content); + eq.update(); + + fireOnPostWrite("content", _oldValue, content); + + } catch (TopiaException eee) { + throw new IsisFishRuntimeException( + _("isisfish.error.change.equation"), eee); + } + } + /* (non-Javadoc) * @see fr.ifremer.isisfish.entities.SelectivityAbstract#setGear(fr.ifremer.isisfish.entities.Gear) */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2010-01-22 15:24:53 UTC (rev 2934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2010-01-22 15:37:21 UTC (rev 2935) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -104,7 +104,7 @@ return result; } - public void setEquationTechnicalEfficiency(String content) { + public void setTechnicalEfficiencyEquationContent(String content) { try { Equation eq = getTechnicalEfficiencyEquation(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2010-01-22 15:24:53 UTC (rev 2934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2010-01-22 15:37:21 UTC (rev 2935) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -165,7 +165,7 @@ return result; } - public void setEquationInactivity(String content) { + public void setInactivityEquationContent(String content) { try { Equation eq = getInactivityEquation(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2010-01-22 15:24:53 UTC (rev 2934) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2010-01-22 15:37:21 UTC (rev 2935) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2006 - 2009 + * Copyright (C) 2006 - 2010 * Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin * * This program is free software; you can redistribute it and/or @@ -74,6 +74,32 @@ return super.getTargetFactorEquation(); } + /** + * Equation content setter for TargetFactorEquation. + * + * @param content content to set + */ + public void setTargetFactorEquationContent(String content) { + try { + Equation eq = getTargetFactorEquation(); + + // can't be null + + // Fire + String _oldValue = eq.getContent(); + fireOnPreWrite("content", _oldValue, content); + + eq.setContent(content); + eq.update(); + + fireOnPostWrite("content", _oldValue, content); + + } catch (TopiaException eee) { + throw new IsisFishRuntimeException( + _("isisfish.error.change.equation"), eee); + } + } + /* (non-Javadoc) * @see fr.ifremer.isisfish.entities.TargetSpeciesAbstract#setMetierSeasonInfo(fr.ifremer.isisfish.entities.MetierSeasonInfo) */ Added: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java (rev 0) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java 2010-01-22 15:37:21 UTC (rev 2935) @@ -0,0 +1,93 @@ +/* *##% + * Copyright (C) 2010 Ifremer, Code Lutin, Chatellier Eric + * + * 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.entity; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; + +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.IsisFishDAOHelper.IsisFishEntityEnum; +import fr.ifremer.isisfish.entities.Equation; + +/** + * Test for convention defined on entities. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class PersistenceConventionTest { + + /** Logger for this class. */ + private static final Log log = LogFactory.getLog(PersistenceConventionTest.class); + + /** + * A convention has been defined on all entities for equation getter/setter. + * + * If getter is : + * <pre>Equation getXXX()</pre> + * setter has to be + * <pre>void setXXXContent(String)</pre> + * + * @throws TopiaException + * @throws NoSuchMethodException + * @throws SecurityException + */ + @Test + public void testEquationSetterName() throws TopiaException, SecurityException, NoSuchMethodException { + + for (IsisFishEntityEnum entityEnum : IsisFishDAOHelper.IsisFishEntityEnum.values()) { + Class<? extends TopiaEntity> entity = entityEnum.getImplementation(); + + if (log.isDebugEnabled()) { + log.debug("Testing convention on : " + entity); + } + + for (Method method : entity.getMethods()) { + Class<?> returnType = method.getReturnType(); + + // method return an equation, search for getter + if (returnType.isAssignableFrom(Equation.class)) { + String methodName = method.getName(); + methodName = methodName.replaceFirst("g", "s") + "Content"; + + try { + Method methodSet = entity.getMethod(methodName, String.class); + + Assert.assertTrue("Method " + entity.getName() + "#" + + methodName + "(" + String.class.getName() + ") is not accessible", Modifier.isPublic(methodSet.getModifiers())); + } + catch (NoSuchMethodException ex) { + Assert.fail("Method " + entity.getName() + "#" + + methodName + "(" + String.class.getName() + ") not found"); + } + } + } + } + } +} Property changes on: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2934 - isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 15:24:53 +0000 (Fri, 22 Jan 2010) New Revision: 2934 Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java Log: Add a compilation test on SimulationStorage Modified: isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java =================================================================== --- isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2010-01-22 15:23:05 UTC (rev 2933) +++ isis-fish/trunk/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2010-01-22 15:24:53 UTC (rev 2934) @@ -19,18 +19,23 @@ package fr.ifremer.isisfish.datastore; +import java.io.File; import java.io.StringWriter; import java.io.Writer; import java.util.Date; import java.util.HashMap; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.simulator.Simulator; import freemarker.template.Configuration; import freemarker.template.Template; @@ -47,6 +52,8 @@ */ public class SimulatorStorageTest extends AbstractIsisFishTest { + private static final Log log = LogFactory.getLog(SimulatorStorageTest.class); + protected Configuration freemarkerConfiguration; @Before @@ -86,4 +93,33 @@ Assert.assertEquals(0, compileResult); } + /** + * Test compilation on {@link JavaSourceStorage} and instanciation. + * + * There was a bug who not compiled if file was never of a non existent file. + * @throws IsisFishException + */ + @Test + public void testSimulatorStorage() throws IsisFishException { + + // Make sur that class file does'nt exists !!! + File f = new File(IsisFish.config.getCompileDirectory(), + "simulators" + File.separator + "DefaultSimulator.class"); + if (f.exists()) { + if (log.isDebugEnabled()) { + log.debug("Delete file : " + f); + } + f.delete(); + } + else { + if (log.isDebugEnabled()) { + log.debug("File : " + f + " doesn't exists !"); + } + } + + SimulatorStorage simulatorStorage = SimulatorStorage.getSimulator("DefaultSimulator"); + Simulator simulator = simulatorStorage.getNewSimulatorInstance(); + Assert.assertNotNull(simulator); + Assert.assertTrue(f.exists()); + } }

1 0

r2933 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 15:23:05 +0000 (Fri, 22 Jan 2010) New Revision: 2933 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix strange automatic import 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 2010-01-22 15:20:26 UTC (rev 2932) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-22 15:23:05 UTC (rev 2933) @@ -43,7 +43,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.xwork.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r2932 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 15:20:26 +0000 (Fri, 22 Jan 2010) New Revision: 2932 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Improve monitoring for ended simulation : now take care of downloaded failed simulations 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 2010-01-22 15:15:12 UTC (rev 2931) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-22 15:20:26 UTC (rev 2932) @@ -43,10 +43,12 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.xwork.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.datastore.SimulationInformation; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationControl; import fr.ifremer.isisfish.simulator.SimulationParameter; @@ -196,8 +198,7 @@ restartSimulation(service, file, simulationId, simulationProperties); } catch (IOException e) { if (log.isErrorEnabled()) { - log.error("Can't get launcher for this simulation", - e); + log.error("Can't get launcher for this simulation", e); } } finally { IOUtils.closeQuietly(propertiesFileIS); @@ -524,11 +525,26 @@ // WARNING this condition is VERY important // and set by end of // fr.ifremer.isisfish.simulator.launcher.InProcessSimulatorLauncher#localSimulateSameThread(SimulationControl, SimulationStorage) - - // FIXME check SimulationStorage.exists(control.getId()) condition - if (control.getProgress() > 0 - && control.getProgress() >= control.getProgressMax() && SimulationStorage.exists(control.getId())) { - simulationEnded = true; + + File simulationRoot = SimulationStorage.getSimulationDirectory(control.getId()); + + // si la simulation n'est pas localement presente, c'est pas fini + if (simulationRoot.isDirectory()) { + // cas d'une simulation terminée + if (control.getProgress() > 0 && + control.getProgress() >= control.getProgressMax()) { + simulationEnded = true; + } + else { + + // cas d'une simulation arretee par exception + + File informationFile = SimulationStorage.getSimulationInformationFile(simulationRoot); + SimulationInformation information = new SimulationInformation(informationFile); + if (StringUtils.isNotEmpty(information.getException())) { + simulationEnded = true; + } + } } } } catch (RemoteException e) {

1 0

r2931 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 15:15:12 +0000 (Fri, 22 Jan 2010) New Revision: 2931 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: Add new configuration to use different isis-database root during simulation. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-22 13:58:33 UTC (rev 2930) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2010-01-22 15:15:12 UTC (rev 2931) @@ -201,6 +201,28 @@ } /** + * Get database directory to use for script. + * + * Defaut to {@link #getDatabaseDirectory()} value, but to + * {@link SimulationContext#getScriptDirectory()} during a simulation. + * + * @return script database directory + */ + public File getContextDatabaseDirectory() { + + // add a subdirectory for simulation context + SimulationContext simContext = SimulationContext.get(); + File scriptDirectory = simContext.getScriptDirectory(); + + if (scriptDirectory == null) { + // if null, not in simulation + scriptDirectory = getDatabaseDirectory(); + } + + return scriptDirectory; + } + + /** * Retourne le lock a utiliser pour la base h2. * * Par defaut la base utilise 'file'.

1 0

r2930 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 13:58:33 +0000 (Fri, 22 Jan 2010) New Revision: 2930 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx Log: Fix NPE when creating a new population Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2010-01-22 12:49:25 UTC (rev 2929) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2010-01-22 13:58:33 UTC (rev 2930) @@ -1,6 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 Ifremer, Code Lutin + * Copyright (C) 2005 - 2010 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -88,9 +88,13 @@ protected void setModel(java.util.List<Zone> availableZones, java.util.List<Zone> selectedZones, JList associatedList){ ZoneListModel zoneModel = new ZoneListModel(availableZones); associatedList.setModel(zoneModel); - for (Zone selectedZone : selectedZones) { - int index = availableZones.indexOf(selectedZone); - associatedList.addSelectionInterval(index, index); + + // can be null at population init + if (selectedZones != null) { + for (Zone selectedZone : selectedZones) { + int index = availableZones.indexOf(selectedZone); + associatedList.addSelectionInterval(index, index); + } } } protected void presenceChanged(){

1 0

r2929 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 12:49:25 +0000 (Fri, 22 Jan 2010) New Revision: 2929 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java Log: Restore simulation control auto save features (usefull for remote simulation monitoring) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2010-01-22 10:20:57 UTC (rev 2928) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2010-01-22 12:49:25 UTC (rev 2929) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002 - 2009 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2002 - 2010 Ifremer, 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 @@ -58,7 +58,11 @@ protected long progress = 0; protected String text = ""; + /** Control save mecanism each time a property is changed (default to false). */ + protected transient boolean autoSaveState = false; + /** + * Init simulation control with simulation id. * * @param id simulation id */ @@ -68,6 +72,26 @@ } /** + * Change auto save state on property change. + * + * Usefull to disable autosave in simulation monitoring. + * + * @param autoSaveState new state + */ + public void setAutoSaveState(boolean autoSaveState) { + this.autoSaveState = autoSaveState; + } + + /** + * Get current auto save state. + * + * @return auto save state + */ + public boolean isAutoSaveState() { + return autoSaveState; + } + + /** * Reset control values for job restart. */ public void reset() { @@ -347,7 +371,7 @@ */ public void propertyChange(PropertyChangeEvent e) { if (!inUpdateFromProperties) { - if (getSimulation() != null) { + if (isAutoSaveState() && getSimulation() != null) { getSimulation().saveControl(this); } }

1 0

r2928 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 22 Jan '10

22 Jan '10

Author: chatellier Date: 2010-01-22 10:20:57 +0000 (Fri, 22 Jan 2010) New Revision: 2928 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix simulation monitoring stop condition. 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 2010-01-20 16:39:20 UTC (rev 2927) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-22 10:20:57 UTC (rev 2928) @@ -527,7 +527,7 @@ // FIXME check SimulationStorage.exists(control.getId()) condition if (control.getProgress() > 0 - && control.getProgress() >= control.getProgressMax() && simulationExists(control.getId())) { + && control.getProgress() >= control.getProgressMax() && SimulationStorage.exists(control.getId())) { simulationEnded = true; } } @@ -541,27 +541,6 @@ } /** - * Check if simulation exists by checking "parameters.properties" file - * existense. - * - * @return {@code true} if simulation exists - */ - protected boolean simulationExists(String simulationId) { - boolean result = false; - - // works better than checking simulationDirectory - // existence, because directory can exists event if - // simulations doesn't exists - File simulationDirectory = new File(SimulationStorage.getSimulationDirectory(), simulationId); - File parametersFile = SimulationStorage.getSimulationParametersFile(simulationDirectory); - if (parametersFile.exists()) { - result = true; - } - - return result; - } - - /** * Operation to do after simulation end. * * - get simulation result

1 0

r2927 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico
by chatellier＠users.labs.libre-entreprise.org 20 Jan '10

20 Jan '10

Author: chatellier Date: 2010-01-20 16:39:20 +0000 (Wed, 20 Jan 2010) New Revision: 2927 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java Log: Error, don't compare with correct string 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 2010-01-20 14:25:46 UTC (rev 2926) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2010-01-20 16:39:20 UTC (rev 2927) @@ -355,7 +355,7 @@ log.debug("Looking for object : " + objectType + ":" + objectString); } - if (!"null".equals(content)) { + if (!"null".equals(objectType)) { ConvertUtilsBean beanUtils = ConverterUtil.getConverter(context); try { value = beanUtils.convert(objectString, Class.forName(objectType));

1 0