Author: chatellier Date: 2009-07-01 17:05:51 +0000 (Wed, 01 Jul 2009) New Revision: 2456 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 Log: Le nom du traget species ne peut pas ?\195?\170tre le nom d'un model, il n'y en a pas au debut. (nom du metier + nom de l'espece + nom de la saison) 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-07-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-07-01 17:05:51 UTC (rev 2456) @@ -735,13 +735,17 @@ } public Object addTargetSpecies(Metier metier, MetierSeasonInfo m, - Species species, String targetFactorEquationName, - String targetFactorEquationContent, boolean primaryCatch) { + Species species, String targetFactorEquationContent, boolean primaryCatch) { if (log.isDebugEnabled()) { log.debug("addTargetSpecies called: " + metier + " " + species + " " + primaryCatch + " " + targetFactorEquationContent); } try { + // build targetFactorEquation name + String targetFactorEquationName = metier.getName() + "-" + species.getName() + + "(" + m.getFirstMonth() + "-" + m.getLastMonth() + ")"; + + TargetSpeciesDAO dao = IsisFishDAOHelper.getTargetSpeciesDAO(metier .getTopiaContext()); TargetSpecies targetSpecies = dao.create(); 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-07-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-07-01 17:05:51 UTC (rev 2456) @@ -108,12 +108,13 @@ protected void add() { Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue(); if (getMetierSeasonInfo() != null && species != null) { - Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); + // il n'y en a pas a la creaion de la base + //Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem(); getContextValue(InputAction.class).addTargetSpecies( getBean(), getMetierSeasonInfo(), (Species)species, - selectedFormule.getName(), + /* selectedFormule.getName(), */ targetFactor.getEditor().getText(), fieldPrimaryCatch.isSelected()); setTableTargetSpeciesModel(); 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-07-01 16:46:19 UTC (rev 2455) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-07-01 17:05:51 UTC (rev 2456) @@ -631,6 +631,7 @@ isisfish.message.script.commit=Enter commit message isisfish.message.setting.cache.aspects=Setting Cache aspects isisfish.message.setting.trace.aspects=Setting Trace aspects +isisfish.message.simulation.after=Result exports isisfish.message.simulation.ended=Simulation ended isisfish.message.simulation.execution=Simulation execution isisfish.message.simulation.prepare=Preparing simulation