Author: sletellier Date: 2009-07-06 15:28:24 +0000 (Mon, 06 Jul 2009) New Revision: 2467 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 isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Refreshing all matrix and the new season is selected in creation 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-06 09:57:40 UTC (rev 2466) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-07-06 15:28:24 UTC (rev 2467) @@ -864,14 +864,15 @@ return null; } - public void createPopulationSeasonInfo(Population pop) { + public PopulationSeasonInfo createPopulationSeasonInfo(Population pop) { if (log.isDebugEnabled()) { log.debug("createSeasonInfo called"); } + PopulationSeasonInfo seasonInfo = null; try { PopulationSeasonInfoDAO dao = IsisFishDAOHelper .getPopulationSeasonInfoDAO(pop.getTopiaContext()); - PopulationSeasonInfo seasonInfo = dao.create(); + seasonInfo = dao.create(); seasonInfo.setFirstMonth(Month.MONTH[0]); seasonInfo.setLastMonth(Month.MONTH[3]); pop.addPopulationSeasonInfo(seasonInfo); @@ -885,6 +886,7 @@ } showMsgBox(eee); } + return seasonInfo; } public void removePopulationSeasonInfo(Population pop, 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-06 09:57:40 UTC (rev 2466) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-07-06 15:28:24 UTC (rev 2467) @@ -95,6 +95,7 @@ lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); } popInfo.setLengthChangeMatrix(lengthChangeMatrix); + matrixPanelPopulationSeasonLengthChange.setMatrix(lengthChangeMatrix); } } catch(Exception eee) { if (log.isErrorEnabled()) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-07-06 09:57:40 UTC (rev 2466) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-07-06 15:28:24 UTC (rev 2467) @@ -53,6 +53,7 @@ public void propertyChange(PropertyChangeEvent evt) { if (getPopulationSeasonInfo() != null) { getPopulationSeasonInfo().setFirstMonth(new Month(seasonInterval.getFirst())); + setReproductionDistributionMatrix(); } } }); @@ -61,6 +62,7 @@ public void propertyChange(PropertyChangeEvent evt) { if (getPopulationSeasonInfo() != null) { getPopulationSeasonInfo().setLastMonth(new Month(seasonInterval.getLast())); + setReproductionDistributionMatrix(); } } }); @@ -80,7 +82,8 @@ create.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - getContextValue(InputAction.class).createPopulationSeasonInfo(getBean()); + PopulationSeasonInfo seasonNew = getContextValue(InputAction.class).createPopulationSeasonInfo(getBean()); + setPopulationSeasonInfo((PopulationSeasonInfoImpl)seasonNew); setPopulationSeasonInfoCombo(); } });