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