Author: chatellier Date: 2009-07-10 16:50:24 +0000 (Fri, 10 Jul 2009) New Revision: 2477 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/PopulationSeasonSpacializedUI.jaxx Log: Init des PSI. Par defaut ?\195?\160 "no spacializ?\195?\169". 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-10 16:49:50 UTC (rev 2476) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-07-10 16:50:24 UTC (rev 2477) @@ -34,6 +34,8 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; +import jaxx.runtime.swing.ErrorDialogUI; + import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.lang.ClassUtils; import org.apache.commons.logging.Log; @@ -71,6 +73,7 @@ import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoDAO; +import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.SelectivityDAO; import fr.ifremer.isisfish.entities.SetOfVessels; @@ -84,7 +87,6 @@ import fr.ifremer.isisfish.ui.input.check.CheckResult; import fr.ifremer.isisfish.ui.input.check.CheckResultFrame; import fr.ifremer.isisfish.util.CellPointcomparator; -import jaxx.runtime.swing.ErrorDialogUI; /** * All code used in input UI. @@ -877,6 +879,15 @@ seasonInfo.setLastMonth(Month.MONTH[3]); pop.addPopulationSeasonInfo(seasonInfo); seasonInfo.setPopulation(pop); + + // EC-20090710 ajout du code d'initailisation + // d'un populationseasoninfo + // il a du se perdre au changement d'interface + // swiat>jaxx + seasonInfo.setSimpleLengthChangeMatrix(true); + MatrixND matrix = ((PopulationSeasonInfoImpl)seasonInfo).createNoSpacializedChangeGroupMatrix(); + seasonInfo.setLengthChangeMatrix(matrix); + seasonInfo.update(); pop.update(); // isisContext.commitTransaction(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-07-10 16:49:50 UTC (rev 2476) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-07-10 16:50:24 UTC (rev 2477) @@ -49,24 +49,16 @@ } }; -addPropertyChangeListener("populationSeasonInfo", new PropertyChangeListener() { +/*addPropertyChangeListener("populationSeasonInfo", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { matrixPanelPopulationSeasonLengthChange.setMatrix(null); } if (evt.getNewValue() != null) { - try { - matrixPanelPopulationSeasonLengthChange.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix().copy()); - } - catch(Exception e) { - // an exception can happen if lengthChange matrix has never - // been initialized - computeMatrixChangeOfGroup(); - matrixPanelPopulationSeasonLengthChange.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix().copy()); - } + matrixPanelPopulationSeasonLengthChange.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix().copy()); } } -}); +});*/ @Override public void refresh() { @@ -171,8 +163,8 @@ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id='matrixPanelPopulationSeasonLengthChange' enabled='{isPopSeasonInfoNotNull()}' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' - visible='{isAgeGroupType()}' decorator='boxed' /> - <!-- matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix().copy()}' --> + visible='{isAgeGroupType()}' decorator='boxed' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix().copy()}' /> </cell> </row> </Table>