Author: sletellier Date: 2009-02-24 11:34:08 +0000 (Tue, 24 Feb 2009) New Revision: 1867 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Debug final Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-02-24 10:57:50 UTC (rev 1866) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2009-02-24 11:34:08 UTC (rev 1867) @@ -55,33 +55,22 @@ protected Interval interval = null; protected IntervalPanel ip = new IntervalPanel(); displayMetierSeason.add(ip, BorderLayout.CENTER); - ip.addPropertyChangeListener("first", new PropertyChangeListener() { + ip.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - // Data extraction - Season season = (Season) fieldMetierSeasonChoice.getSelectedItem(); - if (season != null){ - Month first = season.getFirstMonth(); - first.setMonthNumber(ip.getModel().getFirst()); - season.setFirstMonth(first); - } - } - }); - ip.addPropertyChangeListener("last", new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { // Data extraction Season season = (Season) fieldMetierSeasonChoice.getSelectedItem(); if (season != null){ + Month first = season.getFirstMonth(); + first.setMonthNumber(ip.getModel().getFirst()); + getMetierSeasonInfo().setFirstMonth(first); Month last = season.getLastMonth(); last.setMonthNumber(ip.getModel().getLast()); - season.setLastMonth(last); + getMetierSeasonInfo().setLastMonth(last); } } }); - create.addActionListener(new ActionListener() { @Override Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 10:57:50 UTC (rev 1866) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 11:34:08 UTC (rev 1867) @@ -43,17 +43,8 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -MatrixPanelListener listener = new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getBean() != null){ - if (fieldPopulationCapturability.getMatrix() != null){ - getBean().setCapturability(fieldPopulationCapturability.getMatrix()); - } - } - } -}; +MatrixPanelListener listener = null; addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -81,6 +72,16 @@ fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy()); } } + listener = new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getBean() != null && fieldPopulationCapturability.getMatrix() != null){ + getBean().setCapturability(fieldPopulationCapturability.getMatrix()); + System.out.println(getBean().getCapturability() + " " + fieldPopulationCapturability.getMatrix()); + } + } + }; fieldPopulationCapturability.addMatrixListener(listener); } ]]> 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-02-24 10:57:50 UTC (rev 1866) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-24 11:34:08 UTC (rev 1867) @@ -52,7 +52,7 @@ protected IntervalPanel ip = new IntervalPanel(); protected Interval interval = new Interval(); fieldPopulationSeasonInterval.add(ip, BorderLayout.CENTER); -ip.addPropertyChangeListener("first", new PropertyChangeListener() { +ip.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -60,15 +60,6 @@ Month first = getPopulationSeasonInfo().getFirstMonth(); first.setMonthNumber(ip.getModel().getFirst()); getPopulationSeasonInfo().setFirstMonth(first); - } - } -}); - - ip.addPropertyChangeListener("last", new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (getPopulationSeasonInfo() != null){ Month last = getPopulationSeasonInfo().getLastMonth(); last.setMonthNumber(ip.getModel().getLast()); getPopulationSeasonInfo().setLastMonth(last); @@ -163,12 +154,14 @@ } } protected void seasonGroupChanged(){ - if (getPopulationSeasonInfo() == null){ + if (getPopulationSeasonInfo() != null){ getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupChange.isSelected()); + System.out.println("getPopulationSeasonInfo() : " + getPopulationSeasonInfo()); } } protected void seasonChanged(){ setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem()); + System.out.println("getPopulationSeasonInfo() : " + getPopulationSeasonInfo()); getVerifier().addCurrentEntity(getPopulationSeasonInfo()); setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null); setInterval();